From 269f1ff8c24516797d3cfe63145116ade070ce41 Mon Sep 17 00:00:00 2001
From: Helge Deller <deller@gmx.de>
Date: Mon, 16 Feb 2009 03:03:11 +0000
Subject: [PATCH] --- yaml --- r: 140039 b: refs/heads/master c:
 c48faf86b0d59cc43ff4eede59c4af7afbd7c0ff h: refs/heads/master i:   140037:
 9d934248022ddfc102b399a4d6aaabc0bc6eb720   140035:
 68cbcba7fd5d2c2b374e64a31d51d737ce4020eb   140031:
 c7c9efaf6cf9201b35104eeafb3c21b4af3a27b6 v: v3

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

diff --git a/[refs] b/[refs]
index 28f220eb3d66..cc0e2307da50 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c84c3a698f17ae5d55a6ecc76298fb894e106336
+refs/heads/master: c48faf86b0d59cc43ff4eede59c4af7afbd7c0ff
diff --git a/trunk/arch/parisc/kernel/traps.c b/trunk/arch/parisc/kernel/traps.c
index 7bf122a5f169..c32f5d6d778e 100644
--- a/trunk/arch/parisc/kernel/traps.c
+++ b/trunk/arch/parisc/kernel/traps.c
@@ -247,6 +247,8 @@ void die_if_kernel(char *str, struct pt_regs *regs, long err)
 
 	oops_in_progress = 1;
 
+	oops_enter();
+
 	/* Amuse the user in a SPARC fashion */
 	if (err) printk(
 KERN_CRIT "      _______________________________ \n"
@@ -293,6 +295,7 @@ KERN_CRIT "                     ||     ||\n");
 		panic("Fatal exception");
 	}
 
+	oops_exit();
 	do_exit(SIGSEGV);
 }