diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2007-08-01 16:17:07 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2007-08-01 16:17:07 +0900 |
| commit | c347d12cd1642ba193f55bdab29395d639c5efc2 (patch) | |
| tree | 4029a5cc49ac3fdbefa57b3117566007b8cfbcc4 /arch | |
| parent | 8d4fbcfbe0a4bfc73e7f0297c59ae514e1f1436f (diff) | |
| download | op-kernel-dev-c347d12cd1642ba193f55bdab29395d639c5efc2.zip op-kernel-dev-c347d12cd1642ba193f55bdab29395d639c5efc2.tar.gz | |
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | 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 |
