diff mbox

sh: unbreak WARN_ON()

Message ID 20090617044820.15262.37086.sendpatchset@rx1.opensource.se (mailing list archive)
State Accepted
Headers show

Commit Message

Magnus Damm June 17, 2009, 4:48 a.m. UTC 
From: Magnus Damm <damm@igel.co.jp>

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

 arch/sh/kernel/traps.c |    1 +
 1 file changed, 1 insertion(+)

--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Paul Mundt June 17, 2009, 6:40 a.m. UTC | #1 
On Wed, Jun 17, 2009 at 01:48:20PM +0900, Magnus Damm wrote:
> Fix WARN_ON() by modifying the bug trap handling code to
> always return in the in-kernel instruction pointer case.

On Wed, Jun 17, 2009 at 01:55:42PM +0900, Magnus Damm wrote:
> Convert the shared clock cpg code from bootmem to slab.
> Without this patch the current bootmem code triggers
> WARN_ON() because the slab is available.

On Wed, Jun 17, 2009 at 02:04:04PM +0900, Magnus Damm wrote:
> Modify the CMT and TMU drivers to disable interrupts when
> disabling the timer. Only using start/stop bits is not
> enough.
> 
> This fixes a bootup hang on Migo-R when the CMT is replaced
> by TMU for clockevents but the CMT keeps on delivering irqs
> even though the timer start bit is off.

Applied, thanks.
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

--- 0001/arch/sh/kernel/traps.c
+++ work/arch/sh/kernel/traps.c	2009-06-16 14:29:42.000000000 +0900
@@ -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