summaryrefslogtreecommitdiffstats
path: root/arch/sh
diff options
context:
space:
mode:
authorMagnus Damm <damm@igel.co.jp>2009-06-17 04:48:20 +0000
committerPaul Mundt <lethal@linux-sh.org>2009-06-17 15:39:52 +0900
commit0ec39885b237c35109644f5d8232228026a72715 (patch)
treeed5819bf0be7adaa6771c974e0354760daaffedf /arch/sh
parent39f4490c70eae62cfed62081243110607069d3f9 (diff)
downloadblackbird-op-linux-0ec39885b237c35109644f5d8232228026a72715.tar.gz
blackbird-op-linux-0ec39885b237c35109644f5d8232228026a72715.zip
sh: unbreak WARN_ON()
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>
Diffstat (limited to 'arch/sh')
-rw-r--r--arch/sh/kernel/traps.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sh/kernel/traps.c b/arch/sh/kernel/traps.c
index 46348ed07cc3..b3e0067db358 100644
--- a/arch/sh/kernel/traps.c
+++ b/arch/sh/kernel/traps.c
@@ -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
OpenPOWER on IntegriCloud