diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2012-11-29 07:42:19 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2012-11-29 07:42:19 +0000 |
| commit | 3a4d0ebd5c32864e4782d7545d6e5835c0baade3 (patch) | |
| tree | 78ecb9785a681e736907238f73d7cd715a83fadf /target/linux/generic | |
| parent | 769c322cd05200841fef52d65964bd10e0916ea4 (diff) | |
| download | master-31e0f0ae-3a4d0ebd5c32864e4782d7545d6e5835c0baade3.tar.gz master-31e0f0ae-3a4d0ebd5c32864e4782d7545d6e5835c0baade3.tar.bz2 master-31e0f0ae-3a4d0ebd5c32864e4782d7545d6e5835c0baade3.zip | |
kernel: update linux 3.6 to 3.6.8
Also refresh the affected patches.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 34402
Diffstat (limited to 'target/linux/generic')
3 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/patches-3.6/340-module_alloc_size_check.patch b/target/linux/generic/patches-3.6/340-module_alloc_size_check.patch index ea9ee53c4a..1aa1b94d9e 100644 --- a/target/linux/generic/patches-3.6/340-module_alloc_size_check.patch +++ b/target/linux/generic/patches-3.6/340-module_alloc_size_check.patch @@ -1,6 +1,6 @@ --- a/kernel/module.c +++ b/kernel/module.c -@@ -2353,12 +2353,15 @@ static void dynamic_debug_remove(struct +@@ -2358,12 +2358,15 @@ static void dynamic_debug_remove(struct void * __weak module_alloc(unsigned long size) { diff --git a/target/linux/generic/patches-3.6/850-glamo_headers.patch b/target/linux/generic/patches-3.6/850-glamo_headers.patch index c75e1d62ea..d6d49fdf50 100644 --- a/target/linux/generic/patches-3.6/850-glamo_headers.patch +++ b/target/linux/generic/patches-3.6/850-glamo_headers.patch @@ -10,7 +10,7 @@ #define FB_ACCEL_NEOMAGIC_NM2093 92 /* NeoMagic NM2093 */ --- a/include/linux/Kbuild +++ b/include/linux/Kbuild -@@ -144,6 +144,8 @@ header-y += generic_serial.h +@@ -145,6 +145,8 @@ header-y += generic_serial.h header-y += genetlink.h header-y += gfs2_ondisk.h header-y += gigaset_dev.h diff --git a/target/linux/generic/patches-3.6/950-vm_exports.patch b/target/linux/generic/patches-3.6/950-vm_exports.patch index cac3bc99cc..ba363c11bd 100644 --- a/target/linux/generic/patches-3.6/950-vm_exports.patch +++ b/target/linux/generic/patches-3.6/950-vm_exports.patch @@ -1,6 +1,6 @@ --- a/mm/shmem.c +++ b/mm/shmem.c -@@ -2902,6 +2902,16 @@ EXPORT_SYMBOL_GPL(shmem_truncate_range); +@@ -2914,6 +2914,16 @@ EXPORT_SYMBOL_GPL(shmem_truncate_range); /* common code */ @@ -17,7 +17,7 @@ /** * shmem_file_setup - get an unlinked file living in tmpfs * @name: name for dentry (to be seen in /proc/<pid>/maps -@@ -2979,11 +2989,8 @@ int shmem_zero_setup(struct vm_area_stru +@@ -2991,11 +3001,8 @@ int shmem_zero_setup(struct vm_area_stru if (IS_ERR(file)) return PTR_ERR(file); |