From: Paul Mundt <lethal@linux-sh.org>
Date: Mon, 18 Jun 2007 09:57:13 +0000 (+0900)
Subject: sh: oops_enter()/oops_exit() in die().
X-Git-Tag: v2.6.22-rc6~84^2~1
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=5527398218aae85f37552a69fad163fa500c39e4;p=linux-2.6-omap-h63xx.git

sh: oops_enter()/oops_exit() in die().

As Russell helpfully pointed out on linux-arch:

	http://marc.info/?l=linux-arch&m=118208089204630&w=2

We were missing the oops_enter/exit() in the sh die() implementation.
As we do support lockdep, it's beneficial to add these calls so lockdep
properly disables itself in the die() case.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
---

diff --git a/arch/sh/kernel/traps.c b/arch/sh/kernel/traps.c
index 5b75cb6f8f9..8f18930d5bf 100644
--- a/arch/sh/kernel/traps.c
+++ b/arch/sh/kernel/traps.c
@@ -83,6 +83,8 @@ void die(const char * str, struct pt_regs * regs, long err)
 {
 	static int die_counter;
 
+	oops_enter();
+
 	console_verbose();
 	spin_lock_irq(&die_lock);
 	bust_spinlocks(1);
@@ -112,6 +114,7 @@ void die(const char * str, struct pt_regs * regs, long err)
 	if (panic_on_oops)
 		panic("Fatal exception");
 
+	oops_exit();
 	do_exit(SIGSEGV);
 }