add even more workarounds for bcm4710, remove -fno-delayed-branch from kernel cflags...

[openwrt.git] / openwrt / target / linux / linux-2.4 / patches / brcm / 003-bcm47xx_workarounds.patch

diff --git a/openwrt/target/linux/linux-2.4/patches/brcm/003-bcm47xx_workarounds.patch b/openwrt/target/linux/linux-2.4/patches/brcm/003-bcm47xx_workarounds.patch
index 6e52e9c725d2e971c2e65139d8f9ce0af7ef5397..73afd60c1e37b8c21d2ef44707d39a4b21a11c81 100644 (file)
--- a/openwrt/target/linux/linux-2.4/patches/brcm/003-bcm47xx_workarounds.patch
+++ b/openwrt/target/linux/linux-2.4/patches/brcm/003-bcm47xx_workarounds.patch
@@ -106,3 +106,17 @@ diff -urN linux.old/arch/mips/mm/tlbex-r4k.S linux.dev/arch/mips/mm/tlbex-r4k.S
        GET_PGD(k0, k1)                         # get pgd pointer
        mfc0    k0, CP0_BADVADDR                # Get faulting address
        srl     k0, k0, _PGDIR_SHIFT            # get pgd only bits
+diff -urN linux.old/arch/mips/kernel/entry.S linux.dev/arch/mips/kernel/entry.S
+--- linux.old/arch/mips/kernel/entry.S 2003-08-25 13:44:40.000000000 +0200
++++ linux.dev/arch/mips/kernel/entry.S 2005-06-01 20:10:36.000000000 +0200
+@@ -100,6 +100,10 @@
+                * and R4400 SC and MC versions.
+                */
+ NESTED(except_vec3_generic, 0, sp)
++#ifdef CONFIG_BCM4710
++              nop
++              nop
++#endif
+ #if R5432_CP0_INTERRUPT_WAR
+               mfc0    k0, CP0_INDEX
+ #endif