From 8d93e9db4250d37162d880fe236e333008e0d8f4 Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Mon, 18 Jun 2007 18:57:13 +0900
Subject: [PATCH] --- yaml --- r: 57875 b: refs/heads/master c:
 5527398218aae85f37552a69fad163fa500c39e4 h: refs/heads/master i:   57873:
 7a51d74172d2b96aadad21f5542920ef4f953547   57871:
 8005e1a798e1c66daef2a7ae31252c13ae4e252f v: v3

---
 [refs]                       | 2 +-
 trunk/arch/sh/kernel/traps.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0df7c990d3ba..e05e032a35c8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 69a331470ff02561cf1898eeb152ccca9f22bf53
+refs/heads/master: 5527398218aae85f37552a69fad163fa500c39e4
diff --git a/trunk/arch/sh/kernel/traps.c b/trunk/arch/sh/kernel/traps.c
index 5b75cb6f8f9b..8f18930d5bf8 100644
--- a/trunk/arch/sh/kernel/traps.c
+++ b/trunk/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);
 }