Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=c347d12cd1642ba193f55bdab29395d639c5efc2
Commit:     c347d12cd1642ba193f55bdab29395d639c5efc2
Parent:     8d4fbcfbe0a4bfc73e7f0297c59ae514e1f1436f
Author:     Paul Mundt <[EMAIL PROTECTED]>
AuthorDate: Wed Aug 1 16:17:07 2007 +0900
Committer:  Paul Mundt <[EMAIL PROTECTED]>
CommitDate: Wed Aug 1 16:17:07 2007 +0900

    sh: Fix lockdep debugging oops on SH-3/4.
    
    In the SH-3/4 TLB access violation path we were enabling IRQs before
    the call in to trace_hardirqs_on(), which ended up triggering:
    
            if (DEBUG_LOCKS_WARN_ON(!irqs_disabled()))
                    return;
    
    in kernel/lockdep.c:2031. Fix this up by removing the early re-enable,
    we were already re-enabling IRQs post-trace_hardirqs_on() already, so
    the semantics are now as was initially intended.
    
    Signed-off-by: Paul Mundt <[EMAIL PROTECTED]>
---
 arch/sh/kernel/cpu/sh3/entry.S |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/arch/sh/kernel/cpu/sh3/entry.S b/arch/sh/kernel/cpu/sh3/entry.S
index d8e1229..0d12a12 100644
--- a/arch/sh/kernel/cpu/sh3/entry.S
+++ b/arch/sh/kernel/cpu/sh3/entry.S
@@ -149,8 +149,7 @@ call_dpf:
         lds    r10, pr
        rts
         nop
-0:     sti
-       mov.l   3f, r0
+0:     mov.l   3f, r0
        mov     r9, r6
        mov     r8, r5
        jmp     @r0
-
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  http://vger.kernel.org/majordomo-info.html

Reply via email to