From 20a359e19561ba37908955d4598fc32a409706cf Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Thu, 21 Jun 2007 23:41:09 +0000 Subject: set the kernel version of brcm47xx-2.6 in the target makefile, keep patch compatibility with 2.6.21.5 in case we need to revert before the next release SVN-Revision: 7698 --- .../linux/brcm47xx-2.6/patches/150-cpu_fixes.patch | 35 ++++++++++------------ 1 file changed, 15 insertions(+), 20 deletions(-) (limited to 'target/linux/brcm47xx-2.6/patches/150-cpu_fixes.patch') diff --git a/target/linux/brcm47xx-2.6/patches/150-cpu_fixes.patch b/target/linux/brcm47xx-2.6/patches/150-cpu_fixes.patch index ef297a4c08..834c7ee76f 100644 --- a/target/linux/brcm47xx-2.6/patches/150-cpu_fixes.patch +++ b/target/linux/brcm47xx-2.6/patches/150-cpu_fixes.patch @@ -1,7 +1,6 @@ -Index: linux-2.6.22-rc4/arch/mips/kernel/genex.S -=================================================================== ---- linux-2.6.22-rc4.orig/arch/mips/kernel/genex.S 2007-06-10 21:32:12.000000000 +0100 -+++ linux-2.6.22-rc4/arch/mips/kernel/genex.S 2007-06-10 21:33:19.000000000 +0100 +diff -ur linux.old/arch/mips/kernel/genex.S linux.dev/arch/mips/kernel/genex.S +--- linux.old/arch/mips/kernel/genex.S 2007-03-23 16:10:35.572499592 +0100 ++++ linux.dev/arch/mips/kernel/genex.S 2007-03-16 11:54:34.901251992 +0100 @@ -51,6 +51,10 @@ NESTED(except_vec3_generic, 0, sp) .set push @@ -13,10 +12,9 @@ Index: linux-2.6.22-rc4/arch/mips/kernel/genex.S #if R5432_CP0_INTERRUPT_WAR mfc0 k0, CP0_INDEX #endif -Index: linux-2.6.22-rc4/arch/mips/mm/c-r4k.c -=================================================================== ---- linux-2.6.22-rc4.orig/arch/mips/mm/c-r4k.c 2007-06-10 21:33:17.000000000 +0100 -+++ linux-2.6.22-rc4/arch/mips/mm/c-r4k.c 2007-06-10 21:33:19.000000000 +0100 +diff -ur linux.old/arch/mips/mm/c-r4k.c linux.dev/arch/mips/mm/c-r4k.c +--- linux.old/arch/mips/mm/c-r4k.c 2007-03-16 12:11:00.344441000 +0100 ++++ linux.dev/arch/mips/mm/c-r4k.c 2007-03-23 16:03:23.596169976 +0100 @@ -29,6 +29,9 @@ #include /* for run_uncached() */ @@ -92,10 +90,9 @@ Index: linux-2.6.22-rc4/arch/mips/mm/c-r4k.c probe_pcache(); setup_scache(); -Index: linux-2.6.22-rc4/arch/mips/mm/tlbex.c -=================================================================== ---- linux-2.6.22-rc4.orig/arch/mips/mm/tlbex.c 2007-06-10 21:33:12.000000000 +0100 -+++ linux-2.6.22-rc4/arch/mips/mm/tlbex.c 2007-06-10 21:33:19.000000000 +0100 +diff -ur linux.old/arch/mips/mm/tlbex.c linux.dev/arch/mips/mm/tlbex.c +--- linux.old/arch/mips/mm/tlbex.c 2007-03-16 11:54:34.826263000 +0100 ++++ linux.dev/arch/mips/mm/tlbex.c 2007-03-23 16:03:23.608168152 +0100 @@ -1229,6 +1229,10 @@ #endif } @@ -120,10 +117,9 @@ Index: linux-2.6.22-rc4/arch/mips/mm/tlbex.c /* * create the plain linear handler */ -Index: linux-2.6.22-rc4/include/asm-mips/r4kcache.h -=================================================================== ---- linux-2.6.22-rc4.orig/include/asm-mips/r4kcache.h 2007-06-10 21:32:12.000000000 +0100 -+++ linux-2.6.22-rc4/include/asm-mips/r4kcache.h 2007-06-10 21:33:19.000000000 +0100 +diff -ur linux.old/include/asm-mips/r4kcache.h linux.dev/include/asm-mips/r4kcache.h +--- linux.old/include/asm-mips/r4kcache.h 2007-01-10 20:10:37.000000000 +0100 ++++ linux.dev/include/asm-mips/r4kcache.h 2007-03-23 16:38:44.603727816 +0100 @@ -17,6 +17,20 @@ #include #include @@ -326,10 +322,9 @@ Index: linux-2.6.22-rc4/include/asm-mips/r4kcache.h +__BUILD_BLAST_CACHE_RANGE(inv_s, scache, Hit_Invalidate_SD,,, ) #endif /* _ASM_R4KCACHE_H */ -Index: linux-2.6.22-rc4/include/asm-mips/stackframe.h -=================================================================== ---- linux-2.6.22-rc4.orig/include/asm-mips/stackframe.h 2007-06-10 21:32:12.000000000 +0100 -+++ linux-2.6.22-rc4/include/asm-mips/stackframe.h 2007-06-10 21:33:19.000000000 +0100 +diff -ur linux.old/include/asm-mips/stackframe.h linux.dev/include/asm-mips/stackframe.h +--- linux.old/include/asm-mips/stackframe.h 2007-03-23 16:10:35.573499440 +0100 ++++ linux.dev/include/asm-mips/stackframe.h 2007-03-16 11:54:34.903251688 +0100 @@ -352,6 +352,10 @@ .macro RESTORE_SP_AND_RET LONG_L sp, PT_R29(sp) -- cgit v1.2.3