diff options
| author | Florian Fainelli <florian@openwrt.org> | 2010-10-27 10:02:03 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2010-10-27 10:02:03 +0000 |
| commit | cfe4c4a10606fca674beecdf9307975a9b007179 (patch) | |
| tree | 3dfae60752e95fbb067ab292b063bca57e87e92a /target/linux/generic/patches-2.6.35 | |
| parent | a82ff63978a32c3dfa350933c9236f926bb95330 (diff) | |
| download | upstream-cfe4c4a10606fca674beecdf9307975a9b007179.tar.gz upstream-cfe4c4a10606fca674beecdf9307975a9b007179.tar.bz2 upstream-cfe4c4a10606fca674beecdf9307975a9b007179.zip | |
refresh 2.6.35 patches
SVN-Revision: 23651
Diffstat (limited to 'target/linux/generic/patches-2.6.35')
| -rw-r--r-- | target/linux/generic/patches-2.6.35/009-decompress_unlzo_fix.patch | 12 | ||||
| -rw-r--r-- | target/linux/generic/patches-2.6.35/980-vm_exports.patch | 2 |
2 files changed, 5 insertions, 9 deletions
diff --git a/target/linux/generic/patches-2.6.35/009-decompress_unlzo_fix.patch b/target/linux/generic/patches-2.6.35/009-decompress_unlzo_fix.patch index 482923dfd2..37e322ad8c 100644 --- a/target/linux/generic/patches-2.6.35/009-decompress_unlzo_fix.patch +++ b/target/linux/generic/patches-2.6.35/009-decompress_unlzo_fix.patch @@ -1,7 +1,5 @@ -Index: linux-2.6.35.7/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 +--- /dev/null ++++ b/include/linux/decompress/unlzo_mm.h @@ -0,0 +1,10 @@ +#ifndef 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 -Index: linux-2.6.35.7/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 +--- a/lib/decompress_unlzo.c ++++ b/lib/decompress_unlzo.c @@ -39,6 +39,7 @@ #include <linux/types.h> diff --git a/target/linux/generic/patches-2.6.35/980-vm_exports.patch b/target/linux/generic/patches-2.6.35/980-vm_exports.patch index 73a221af87..8a021e24c7 100644 --- a/target/linux/generic/patches-2.6.35/980-vm_exports.patch +++ b/target/linux/generic/patches-2.6.35/980-vm_exports.patch @@ -122,7 +122,7 @@ void *caller) --- a/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); struct file *shmem_file_setup(const char *name, loff_t size, unsigned long flags); |