Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / arch / mips / mm / cex-sb1.S

diff --git a/arch/mips/mm/cex-sb1.S b/arch/mips/mm/cex-sb1.S
index e7c0622..e54a62f 100644 (file)
--- a/arch/mips/mm/cex-sb1.S
+++ b/arch/mips/mm/cex-sb1.S
@@ -15,7 +15,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
-#include <linux/config.h>
 #include <linux/init.h>
 
 #include <asm/asm.h>
@@ -65,6 +64,10 @@ LEAF(except_vec2_sb1)
        sd      k0,0x170($0)
        sd      k1,0x178($0)
 
+#ifdef CONFIG_SB1_CEX_ALWAYS_FATAL
+       j       handle_vec2_sb1
+        nop
+#else
        /*
         * M_ERRCTL_RECOVERABLE is bit 31, which makes it easy to tell
         * if we can fast-path out of here for a h/w-recovered error.
@@ -135,6 +138,7 @@ unrecoverable:
        /* Unrecoverable Icache or Dcache error; log it and/or fail */
        j       handle_vec2_sb1
         nop
+#endif
 
 END(except_vec2_sb1)