]> err.no Git - linux-2.6/commitdiff
[MIPS] lockdep: Handle interrupts in R3000 style c0_status register.
authorChris Dearman <chris@mips.com>
Mon, 26 Mar 2007 13:47:06 +0000 (14:47 +0100)
committerRalf Baechle <ralf@linux-mips.org>
Thu, 29 Mar 2007 22:46:35 +0000 (23:46 +0100)
Check the IEP bit for R3000 style processors when checking to see if
interrupts will be reenabled in restore_all.

Signed-off-by: Chris Dearman <chris@mips.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
arch/mips/kernel/entry.S

index 0b78fcbf044ab563453850fe8d404ca3615b6053..686249c5c328a34c105e1c50d458b71effa033f7 100644 (file)
@@ -121,7 +121,11 @@ FEXPORT(restore_partial)           # restore partial frame
        SAVE_AT
        SAVE_TEMP
        LONG_L  v0, PT_STATUS(sp)
-       and     v0, 1
+#if defined(CONFIG_CPU_R3000) || defined(CONFIG_CPU_TX39XX)
+       and     v0, ST0_IEP
+#else
+       and     v0, ST0_IE
+#endif
        beqz    v0, 1f
        jal     trace_hardirqs_on
        b       2f