summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/dumpstack_32.c
diff options
context:
space:
mode:
authorAlexander van Heukelum <heukelum@fastmail.fm>2008-10-22 12:00:08 +0200
committerIngo Molnar <mingo@elte.hu>2008-10-22 14:00:22 +0200
commitb4b8f87bf4958cbad620654efc0882ac46c19846 (patch)
treeac94939d6bc8e75e212225da99ccbf8a48e7c30e /arch/x86/kernel/dumpstack_32.c
parentcf52ebedba77ee494b495dedd3a1f55944611275 (diff)
downloadop-kernel-dev-b4b8f87bf4958cbad620654efc0882ac46c19846.zip
op-kernel-dev-b4b8f87bf4958cbad620654efc0882ac46c19846.tar.gz
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>
Diffstat (limited to 'arch/x86/kernel/dumpstack_32.c')
-rw-r--r--arch/x86/kernel/dumpstack_32.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c
index b361475..5493d31 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)
OpenPOWER on IntegriCloud