Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c347d12c authored by Paul Mundt's avatar Paul Mundt
Browse files

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: default avatarPaul Mundt <lethal@linux-sh.org>
parent 8d4fbcfb
Loading
Loading
Loading
Loading
+1 −2
Original line number Original line Diff line number Diff line
@@ -149,8 +149,7 @@ call_dpf:
	 lds	r10, pr
	 lds	r10, pr
	rts
	rts
	 nop
	 nop
0:	sti
0:	mov.l	3f, r0
	mov.l	3f, r0
	mov	r9, r6
	mov	r9, r6
	mov	r8, r5
	mov	r8, r5
	jmp	@r0
	jmp	@r0