sh: unbreak WARN_ON()
authorMagnus Damm <damm@igel.co.jp>
Wed, 17 Jun 2009 04:48:20 +0000 (04:48 +0000)
committerPaul Mundt <lethal@linux-sh.org>
Wed, 17 Jun 2009 06:39:52 +0000 (15:39 +0900)
Fix WARN_ON() by modifying the bug trap handling code to
always return in the in-kernel instruction pointer case.

Signed-off-by: Magnus Damm <damm@igel.co.jp>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
arch/sh/kernel/traps.c

index 46348ed..b3e0067 100644 (file)
@@ -69,6 +69,7 @@ BUILD_TRAP_HANDLER(bug)
                insn_size_t insn = *(insn_size_t *)instruction_pointer(regs);
                if (insn == TRAPA_BUG_OPCODE)
                        handle_BUG(regs);
+               return;
        }
 #endif