diff options
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/kernel/dumpstack_32.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c index b3614752197b..5493d31be4e5 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) | |||
309 | 309 | ||
310 | void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr) | 310 | void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr) |
311 | { | 311 | { |
312 | if (regs && kexec_should_crash(current)) | ||
313 | crash_kexec(regs); | ||
314 | |||
312 | bust_spinlocks(0); | 315 | bust_spinlocks(0); |
313 | die_owner = -1; | 316 | die_owner = -1; |
314 | add_taint(TAINT_DIE); | 317 | add_taint(TAINT_DIE); |
@@ -318,8 +321,6 @@ void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr) | |||
318 | if (!regs) | 321 | if (!regs) |
319 | return; | 322 | return; |
320 | 323 | ||
321 | if (kexec_should_crash(current)) | ||
322 | crash_kexec(regs); | ||
323 | if (in_interrupt()) | 324 | if (in_interrupt()) |
324 | panic("Fatal exception in interrupt"); | 325 | panic("Fatal exception in interrupt"); |
325 | if (panic_on_oops) | 326 | if (panic_on_oops) |