aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2009-12-04 20:26:55 +0000
committerGabor Juhos <juhosg@openwrt.org>2009-12-04 20:26:55 +0000
commit1b04095cb22e601fd05daae7ffe21b27a6b8db7d (patch)
tree397cce79bf4f95d7058d97f11b36bce2d0290c69
parenta47b8566a194791a02ec969ce0756e8f7ad972f6 (diff)
downloadupstream-1b04095cb22e601fd05daae7ffe21b27a6b8db7d.tar.gz
upstream-1b04095cb22e601fd05daae7ffe21b27a6b8db7d.tar.bz2
upstream-1b04095cb22e601fd05daae7ffe21b27a6b8db7d.zip
kernel: add md5sum for 2.6.32 final, and refresh patches
SVN-Revision: 18636
-rw-r--r--include/kernel-version.mk3
-rw-r--r--target/linux/generic-2.6/patches-2.6.32/013-gcc4_inline_fix.patch6
-rw-r--r--target/linux/generic-2.6/patches-2.6.32/020-mips_multi_machine_support.patch2
-rw-r--r--target/linux/generic-2.6/patches-2.6.32/021-mips_image_cmdline_hack.patch2
-rw-r--r--target/linux/generic-2.6/patches-2.6.32/025-mips_disable_fpu.patch2
-rw-r--r--target/linux/generic-2.6/patches-2.6.32/840-unable_to_open_console.patch2
-rw-r--r--target/linux/generic-2.6/patches-2.6.32/922-gpiommc.patch2
-rw-r--r--target/linux/generic-2.6/patches-2.6.32/999-use_preinit_as_init.patch2
8 files changed, 12 insertions, 9 deletions
diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index cb2fd60c5a..420bd115eb 100644
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -25,6 +25,9 @@ endif
ifeq ($(LINUX_VERSION),2.6.31.6)
LINUX_KERNEL_MD5SUM:=485472df88af84becdcf47f45de3ba46
endif
+ifeq ($(LINUX_VERSION),2.6.32)
+ LINUX_KERNEL_MD5SUM:=260551284ac224c3a43c4adac7df4879
+endif
# disable the md5sum check for unknown kernel versions
LINUX_KERNEL_MD5SUM?=x
diff --git a/target/linux/generic-2.6/patches-2.6.32/013-gcc4_inline_fix.patch b/target/linux/generic-2.6/patches-2.6.32/013-gcc4_inline_fix.patch
index 9997ff2832..77ab405439 100644
--- a/target/linux/generic-2.6/patches-2.6.32/013-gcc4_inline_fix.patch
+++ b/target/linux/generic-2.6/patches-2.6.32/013-gcc4_inline_fix.patch
@@ -1,8 +1,8 @@
--- a/arch/mips/include/asm/system.h
+++ b/arch/mips/include/asm/system.h
-@@ -197,7 +197,7 @@ extern __u64 __xchg_u64_unsupported_on_3
- if something tries to do an invalid xchg(). */
- extern void __xchg_called_with_bad_pointer(void);
+@@ -194,7 +194,7 @@ extern __u64 __xchg_u64_unsupported_on_3
+ #define __xchg_u64 __xchg_u64_unsupported_on_32bit_kernels
+ #endif
-static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int size)
+static __always_inline unsigned long __xchg(unsigned long x, volatile void * ptr, int size)
diff --git a/target/linux/generic-2.6/patches-2.6.32/020-mips_multi_machine_support.patch b/target/linux/generic-2.6/patches-2.6.32/020-mips_multi_machine_support.patch
index 3ffd2f3317..894a16b785 100644
--- a/target/linux/generic-2.6/patches-2.6.32/020-mips_multi_machine_support.patch
+++ b/target/linux/generic-2.6/patches-2.6.32/020-mips_multi_machine_support.patch
@@ -132,7 +132,7 @@
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -840,6 +840,9 @@ config MIPS_DISABLE_OBSOLETE_IDE
+@@ -854,6 +854,9 @@ config MIPS_DISABLE_OBSOLETE_IDE
config SYNC_R4K
bool
diff --git a/target/linux/generic-2.6/patches-2.6.32/021-mips_image_cmdline_hack.patch b/target/linux/generic-2.6/patches-2.6.32/021-mips_image_cmdline_hack.patch
index 5efd93d35f..8b9cfe32cd 100644
--- a/target/linux/generic-2.6/patches-2.6.32/021-mips_image_cmdline_hack.patch
+++ b/target/linux/generic-2.6/patches-2.6.32/021-mips_image_cmdline_hack.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -843,6 +843,10 @@ config SYNC_R4K
+@@ -857,6 +857,10 @@ config SYNC_R4K
config MIPS_MACHINE
def_bool n
diff --git a/target/linux/generic-2.6/patches-2.6.32/025-mips_disable_fpu.patch b/target/linux/generic-2.6/patches-2.6.32/025-mips_disable_fpu.patch
index 43383916c1..e1e9f73699 100644
--- a/target/linux/generic-2.6/patches-2.6.32/025-mips_disable_fpu.patch
+++ b/target/linux/generic-2.6/patches-2.6.32/025-mips_disable_fpu.patch
@@ -8,7 +8,7 @@ Signed-off-by: Florian Fainelli <florian@openwrt.org>
--
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -828,6 +828,17 @@ config I8259
+@@ -842,6 +842,17 @@ config I8259
config MIPS_BONITO64
bool
diff --git a/target/linux/generic-2.6/patches-2.6.32/840-unable_to_open_console.patch b/target/linux/generic-2.6/patches-2.6.32/840-unable_to_open_console.patch
index 15b5461129..c9a2774689 100644
--- a/target/linux/generic-2.6/patches-2.6.32/840-unable_to_open_console.patch
+++ b/target/linux/generic-2.6/patches-2.6.32/840-unable_to_open_console.patch
@@ -1,6 +1,6 @@
--- a/init/main.c
+++ b/init/main.c
-@@ -817,7 +817,7 @@ static noinline int init_post(void)
+@@ -812,7 +812,7 @@ static noinline int init_post(void)
numa_default_policy();
if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
diff --git a/target/linux/generic-2.6/patches-2.6.32/922-gpiommc.patch b/target/linux/generic-2.6/patches-2.6.32/922-gpiommc.patch
index e2547eda8f..27779a8136 100644
--- a/target/linux/generic-2.6/patches-2.6.32/922-gpiommc.patch
+++ b/target/linux/generic-2.6/patches-2.6.32/922-gpiommc.patch
@@ -829,7 +829,7 @@
+be done automatically.
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -2348,6 +2348,11 @@ T: git git://git.kernel.org/pub/scm/linu
+@@ -2377,6 +2377,11 @@ T: git git://git.kernel.org/pub/scm/linu
S: Maintained
F: drivers/media/video/gspca/
diff --git a/target/linux/generic-2.6/patches-2.6.32/999-use_preinit_as_init.patch b/target/linux/generic-2.6/patches-2.6.32/999-use_preinit_as_init.patch
index 7bea5256d7..0a52a87e83 100644
--- a/target/linux/generic-2.6/patches-2.6.32/999-use_preinit_as_init.patch
+++ b/target/linux/generic-2.6/patches-2.6.32/999-use_preinit_as_init.patch
@@ -1,6 +1,6 @@
--- a/init/main.c
+++ b/init/main.c
-@@ -841,10 +841,7 @@ static noinline int init_post(void)
+@@ -836,10 +836,7 @@ static noinline int init_post(void)
printk(KERN_WARNING "Failed to execute %s. Attempting "
"defaults...\n", execute_command);
}