From: Magnus Damm <damm@igel.co.jp>
Date: Wed, 17 Jun 2009 04:48:20 +0000 (+0000)
Subject: sh: unbreak WARN_ON()
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0ec39885b237c35109644f5d8232228026a72715;p=linux-beck.git

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>
---

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