Commit:     cbde5ebc972c0577741a69c85d5e5afad19d813b
Parent:     eb541cb24078eae83b9ef0573af36347d8dc01ee
Author:     Chris Dearman <[EMAIL PROTECTED]>
AuthorDate: Mon Mar 26 14:47:06 2007 +0100
Committer:  Ralf Baechle <[EMAIL PROTECTED]>
CommitDate: Thu Mar 29 23:46:35 2007 +0100

    [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 <[EMAIL PROTECTED]>
    Signed-off-by: Ralf Baechle <[EMAIL PROTECTED]>
 arch/mips/kernel/entry.S |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/arch/mips/kernel/entry.S b/arch/mips/kernel/entry.S
index 0b78fcb..686249c 100644
--- a/arch/mips/kernel/entry.S
+++ b/arch/mips/kernel/entry.S
@@ -121,7 +121,11 @@ FEXPORT(restore_partial)           # restore partial frame
        LONG_L  v0, PT_STATUS(sp)
-       and     v0, 1
+#if defined(CONFIG_CPU_R3000) || defined(CONFIG_CPU_TX39XX)
+       and     v0, ST0_IEP
+       and     v0, ST0_IE
        beqz    v0, 1f
        jal     trace_hardirqs_on
        b       2f
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to