summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-05-10 00:35:42 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-05-10 00:35:42 +0000
commit905e130e13a03166ebb972433110fc272e28e4ab (patch)
treed5a083d440a6bd05ae182c835ac5dd55567dc338
parent25ec0aa7d25a6d19e8ebf2fe981185bf61f18762 (diff)
patch the correct exception handler (see #1642)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7154 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/brcm47xx-2.6/patches/150-cpu_fixes.patch10
1 files changed, 5 insertions, 5 deletions
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 531796bf14..29d313995f 100644
--- a/target/linux/brcm47xx-2.6/patches/150-cpu_fixes.patch
+++ b/target/linux/brcm47xx-2.6/patches/150-cpu_fixes.patch
@@ -1,17 +1,17 @@
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
-@@ -73,6 +73,10 @@
+@@ -50,6 +50,10 @@
+ NESTED(except_vec3_generic, 0, sp)
.set push
- .set mips3
.set noat
+#ifdef CONFIG_BCM947XX
+ nop
+ nop
+#endif
- mfc0 k1, CP0_CAUSE
- li k0, 31<<2
- andi k1, k1, 0x7c
+ #if R5432_CP0_INTERRUPT_WAR
+ mfc0 k0, CP0_INDEX
+ #endif
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