kernel: add md5sum for 2.6.32 final, and refresh patches
SVN-Revision: 18636
This commit is contained in:
parent
a47b8566a1
commit
1b04095cb2
8 changed files with 12 additions and 9 deletions
|
@ -25,6 +25,9 @@ endif
|
||||||
ifeq ($(LINUX_VERSION),2.6.31.6)
|
ifeq ($(LINUX_VERSION),2.6.31.6)
|
||||||
LINUX_KERNEL_MD5SUM:=485472df88af84becdcf47f45de3ba46
|
LINUX_KERNEL_MD5SUM:=485472df88af84becdcf47f45de3ba46
|
||||||
endif
|
endif
|
||||||
|
ifeq ($(LINUX_VERSION),2.6.32)
|
||||||
|
LINUX_KERNEL_MD5SUM:=260551284ac224c3a43c4adac7df4879
|
||||||
|
endif
|
||||||
|
|
||||||
# disable the md5sum check for unknown kernel versions
|
# disable the md5sum check for unknown kernel versions
|
||||||
LINUX_KERNEL_MD5SUM?=x
|
LINUX_KERNEL_MD5SUM?=x
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
--- a/arch/mips/include/asm/system.h
|
--- a/arch/mips/include/asm/system.h
|
||||||
+++ b/arch/mips/include/asm/system.h
|
+++ b/arch/mips/include/asm/system.h
|
||||||
@@ -197,7 +197,7 @@ extern __u64 __xchg_u64_unsupported_on_3
|
@@ -194,7 +194,7 @@ extern __u64 __xchg_u64_unsupported_on_3
|
||||||
if something tries to do an invalid xchg(). */
|
#define __xchg_u64 __xchg_u64_unsupported_on_32bit_kernels
|
||||||
extern void __xchg_called_with_bad_pointer(void);
|
#endif
|
||||||
|
|
||||||
-static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int size)
|
-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)
|
+static __always_inline unsigned long __xchg(unsigned long x, volatile void * ptr, int size)
|
||||||
|
|
|
@ -132,7 +132,7 @@
|
||||||
|
|
||||||
--- a/arch/mips/Kconfig
|
--- a/arch/mips/Kconfig
|
||||||
+++ b/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
|
config SYNC_R4K
|
||||||
bool
|
bool
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/arch/mips/Kconfig
|
--- a/arch/mips/Kconfig
|
||||||
+++ b/arch/mips/Kconfig
|
+++ b/arch/mips/Kconfig
|
||||||
@@ -843,6 +843,10 @@ config SYNC_R4K
|
@@ -857,6 +857,10 @@ config SYNC_R4K
|
||||||
config MIPS_MACHINE
|
config MIPS_MACHINE
|
||||||
def_bool n
|
def_bool n
|
||||||
|
|
||||||
|
|
|
@ -8,7 +8,7 @@ Signed-off-by: Florian Fainelli <florian@openwrt.org>
|
||||||
--
|
--
|
||||||
--- a/arch/mips/Kconfig
|
--- a/arch/mips/Kconfig
|
||||||
+++ b/arch/mips/Kconfig
|
+++ b/arch/mips/Kconfig
|
||||||
@@ -828,6 +828,17 @@ config I8259
|
@@ -842,6 +842,17 @@ config I8259
|
||||||
config MIPS_BONITO64
|
config MIPS_BONITO64
|
||||||
bool
|
bool
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/init/main.c
|
--- a/init/main.c
|
||||||
+++ b/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();
|
numa_default_policy();
|
||||||
|
|
||||||
if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
|
if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
|
||||||
|
|
|
@ -829,7 +829,7 @@
|
||||||
+be done automatically.
|
+be done automatically.
|
||||||
--- a/MAINTAINERS
|
--- a/MAINTAINERS
|
||||||
+++ b/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
|
S: Maintained
|
||||||
F: drivers/media/video/gspca/
|
F: drivers/media/video/gspca/
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/init/main.c
|
--- a/init/main.c
|
||||||
+++ b/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 "
|
printk(KERN_WARNING "Failed to execute %s. Attempting "
|
||||||
"defaults...\n", execute_command);
|
"defaults...\n", execute_command);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue