Skip to content

Commit

Permalink
sh: Fix lockdep debugging oops on SH-3/4.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Paul Mundt committed Aug 1, 2007
1 parent 8d4fbcf commit c347d12
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions arch/sh/kernel/cpu/sh3/entry.S
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit c347d12

Please sign in to comment.