mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-24 09:33:07 +02:00
[kernel] refresh 2.6.35 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23651 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
1858e40a15
commit
2c6502bc88
@ -1,7 +1,5 @@
|
|||||||
Index: linux-2.6.35.7/include/linux/decompress/unlzo_mm.h
|
--- /dev/null
|
||||||
===================================================================
|
+++ b/include/linux/decompress/unlzo_mm.h
|
||||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
|
||||||
+++ linux-2.6.35.7/include/linux/decompress/unlzo_mm.h 2010-10-23 09:32:04.000000000 +0800
|
|
||||||
@@ -0,0 +1,10 @@
|
@@ -0,0 +1,10 @@
|
||||||
+#ifndef UNLZO_MM_H
|
+#ifndef UNLZO_MM_H
|
||||||
+#define UNLZO_MM_H
|
+#define UNLZO_MM_H
|
||||||
@ -13,10 +11,8 @@ Index: linux-2.6.35.7/include/linux/decompress/unlzo_mm.h
|
|||||||
+#endif
|
+#endif
|
||||||
+
|
+
|
||||||
+#endif
|
+#endif
|
||||||
Index: linux-2.6.35.7/lib/decompress_unlzo.c
|
--- a/lib/decompress_unlzo.c
|
||||||
===================================================================
|
+++ b/lib/decompress_unlzo.c
|
||||||
--- linux-2.6.35.7.orig/lib/decompress_unlzo.c 2010-10-23 09:29:09.000000000 +0800
|
|
||||||
+++ linux-2.6.35.7/lib/decompress_unlzo.c 2010-10-23 09:32:53.000000000 +0800
|
|
||||||
@@ -39,6 +39,7 @@
|
@@ -39,6 +39,7 @@
|
||||||
|
|
||||||
#include <linux/types.h>
|
#include <linux/types.h>
|
||||||
|
@ -122,7 +122,7 @@
|
|||||||
void *caller)
|
void *caller)
|
||||||
--- a/include/linux/mm.h
|
--- a/include/linux/mm.h
|
||||||
+++ b/include/linux/mm.h
|
+++ b/include/linux/mm.h
|
||||||
@@ -732,6 +732,7 @@ extern void show_free_areas(void);
|
@@ -736,6 +736,7 @@ extern void show_free_areas(void);
|
||||||
|
|
||||||
int shmem_lock(struct file *file, int lock, struct user_struct *user);
|
int shmem_lock(struct file *file, int lock, struct user_struct *user);
|
||||||
struct file *shmem_file_setup(const char *name, loff_t size, unsigned long flags);
|
struct file *shmem_file_setup(const char *name, loff_t size, unsigned long flags);
|
||||||
|
Loading…
Reference in New Issue
Block a user