patch the correct exception handler (see #1642)

SVN-Revision: 7154
This commit is contained in:
Felix Fietkau 2007-05-10 00:35:42 +00:00
parent 8fd58014cd
commit f27973cad1

View File

@ -1,17 +1,17 @@
diff -ur linux.old/arch/mips/kernel/genex.S linux.dev/arch/mips/kernel/genex.S 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.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 +++ 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 push
.set mips3
.set noat .set noat
+#ifdef CONFIG_BCM947XX +#ifdef CONFIG_BCM947XX
+ nop + nop
+ nop + nop
+#endif +#endif
mfc0 k1, CP0_CAUSE #if R5432_CP0_INTERRUPT_WAR
li k0, 31<<2 mfc0 k0, CP0_INDEX
andi k1, k1, 0x7c #endif
diff -ur linux.old/arch/mips/mm/c-r4k.c linux.dev/arch/mips/mm/c-r4k.c 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.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 +++ linux.dev/arch/mips/mm/c-r4k.c 2007-03-23 16:03:23.596169976 +0100