From b87d492e713175e28153f2dbb69c0aa91dc99d20 Mon Sep 17 00:00:00 2001
From: Horms <horms@verge.net.au>
Date: Wed, 15 Feb 2006 17:23:09 +0900
Subject: [PATCH] --- yaml --- r: 20444 b: refs/heads/master c:
 b05de01ae1c76b7d61da21bbcc26345bf7a9052f h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/arch/ia64/kernel/traps.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f9ebc521bebb..978f900a4d94 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: defbb2c929cbe89dc92239b303cd33d3c85e9a83
+refs/heads/master: b05de01ae1c76b7d61da21bbcc26345bf7a9052f
diff --git a/trunk/arch/ia64/kernel/traps.c b/trunk/arch/ia64/kernel/traps.c
index 55391901b013..dabd6c32641e 100644
--- a/trunk/arch/ia64/kernel/traps.c
+++ b/trunk/arch/ia64/kernel/traps.c
@@ -16,6 +16,7 @@
 #include <linux/module.h>       /* for EXPORT_SYMBOL */
 #include <linux/hardirq.h>
 #include <linux/kprobes.h>
+#include <linux/delay.h>		/* for ssleep() */
 
 #include <asm/fpswa.h>
 #include <asm/ia32.h>
@@ -116,6 +117,13 @@ die (const char *str, struct pt_regs *regs, long err)
 	bust_spinlocks(0);
 	die.lock_owner = -1;
 	spin_unlock_irq(&die.lock);
+
+	if (panic_on_oops) {
+		printk(KERN_EMERG "Fatal exception: panic in 5 seconds\n");
+		ssleep(5);
+		panic("Fatal exception");
+	}
+
   	do_exit(SIGSEGV);
 }