From b2b7a922062eb9a44ee60ce255605d38cfeba646 Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Tue, 15 May 2007 08:36:36 +0900
Subject: [PATCH] --- yaml --- r: 56802 b: refs/heads/master c:
 e113276624104d9c3b25f333d8dd999b804d980a h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 66ae2df34164..3b14b3743b31 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f3a9022fd187de41a04de9c5b44ff40e68c6d661
+refs/heads/master: e113276624104d9c3b25f333d8dd999b804d980a
diff --git a/trunk/arch/sh/kernel/traps.c b/trunk/arch/sh/kernel/traps.c
index a01e36705c5f..5b75cb6f8f9b 100644
--- a/trunk/arch/sh/kernel/traps.c
+++ b/trunk/arch/sh/kernel/traps.c
@@ -21,6 +21,7 @@
 #include <linux/bug.h>
 #include <linux/debug_locks.h>
 #include <linux/kdebug.h>
+#include <linux/kexec.h>
 #include <linux/limits.h>
 #include <asm/system.h>
 #include <asm/uaccess.h>
@@ -101,6 +102,16 @@ void die(const char * str, struct pt_regs * regs, long err)
 
 	bust_spinlocks(0);
 	spin_unlock_irq(&die_lock);
+
+	if (kexec_should_crash(current))
+		crash_kexec(regs);
+
+	if (in_interrupt())
+		panic("Fatal exception in interrupt");
+
+	if (panic_on_oops)
+		panic("Fatal exception");
+
 	do_exit(SIGSEGV);
 }