summaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-12-04 20:26:55 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-12-04 20:26:55 +0000
commit73fec548e60353ce9a2edaa6034287dcc7f11397 (patch)
tree3a846e402deaeb81144af2a1be2ab2ac17d26ddd /target
parent7a42d311275281c3c0e821cfd592d65bab253267 (diff)
kernel: add md5sum for 2.6.32 final, and refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18636 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
-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
7 files changed, 9 insertions, 9 deletions
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 9997ff283..77ab40543 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 3ffd2f331..894a16b78 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 5efd93d35..8b9cfe32c 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 43383916c..e1e9f7369 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 15b546112..c9a277468 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 e2547eda8..27779a813 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 7bea5256d..0a52a87e8 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);
}