From: Chris Dearman <chris@mips.com>
Date: Mon, 26 Mar 2007 13:47:06 +0000 (+0100)
Subject: [MIPS] lockdep: Handle interrupts in R3000 style c0_status register.
X-Git-Tag: v2.6.21-rc6~45^2~6
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=cbde5ebc972c0577741a69c85d5e5afad19d813b;p=linux-2.6-omap-h63xx.git

[MIPS] lockdep: Handle interrupts in R3000 style c0_status register.

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>
---

diff --git a/arch/mips/kernel/entry.S b/arch/mips/kernel/entry.S
index 0b78fcbf044..686249c5c32 100644
--- a/arch/mips/kernel/entry.S
+++ b/arch/mips/kernel/entry.S
@@ -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