From: Helge Deller <deller@gmx.de>
Date: Mon, 16 Feb 2009 03:03:11 +0000 (+0000)
Subject: parisc: oops_enter()/oops_exit() in die()
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=c48faf86b0d59cc43ff4eede59c4af7afbd7c0ff;p=deliverable%2Flinux.git

parisc: oops_enter()/oops_exit() in die()

As pointed out by Russell in http://marc.info/?l=linux-arch&m=118208089204630&w=2

Signed-off-by: Helge Deller <deller@gmx.de>
Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
---

diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
index 7bf122a5f169..c32f5d6d778e 100644
--- a/arch/parisc/kernel/traps.c
+++ b/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);
 }