From: Alexander van Heukelum <heukelum@fastmail.fm>
Date: Wed, 22 Oct 2008 10:00:08 +0000 (+0200)
Subject: i386, dumpstack: move crash_kexec before bust_spinlocks(0) in oops_end
X-Git-Tag: v2.6.29-rc1~587^2~4^10~7
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=b4b8f87bf4958cbad620654efc0882ac46c19846;p=linux-2.6-omap-h63xx.git

i386, dumpstack: move crash_kexec before bust_spinlocks(0) in oops_end

crash_kexec should not be called with console_sem held. Move
the call before bust_spinlocks(0) in oops_end to avoid the
problem.

Signed-off-by: Alexander van Heukelum <heukelum@fastmail.fm>
Acked-by: "Neil Horman" <nhorman@tuxdriver.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c
index b3614752197..5493d31be4e 100644
--- a/arch/x86/kernel/dumpstack_32.c
+++ b/arch/x86/kernel/dumpstack_32.c
@@ -309,6 +309,9 @@ unsigned __kprobes long oops_begin(void)
 
 void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr)
 {
+	if (regs && kexec_should_crash(current))
+		crash_kexec(regs);
+
 	bust_spinlocks(0);
 	die_owner = -1;
 	add_taint(TAINT_DIE);
@@ -318,8 +321,6 @@ void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr)
 	if (!regs)
 		return;
 
-	if (kexec_should_crash(current))
-		crash_kexec(regs);
 	if (in_interrupt())
 		panic("Fatal exception in interrupt");
 	if (panic_on_oops)