Browse Source

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 <lethal@linux-sh.org>
Paul Mundt 18 years ago
parent
commit
c347d12cd1
1 changed files with 1 additions and 2 deletions
  1. 1 2
      arch/sh/kernel/cpu/sh3/entry.S

+ 1 - 2
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