diff options
author | Alexander van Heukelum <heukelum@fastmail.fm> | 2008-10-22 06:00:11 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-10-22 08:00:24 -0400 |
commit | 10b14cb7eb7dd5bff8023f76a55c8ac20e586128 (patch) | |
tree | 652d1ec20eec92b5143a4e7f562469dee8efee29 /arch/x86/kernel/dumpstack_32.c | |
parent | 0ed7a498f416dcfa1cca478a559238a2a3396240 (diff) |
x86, dumpstack: always call oops_exit from oops_end
Always call oops_exit from oops_end, even if signr==0.
Also, move add_taint(TAINT_DIE) from __die to oops_end
on x86_64 and interchange two lines to make oops_end
more similar to the i386-version.
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c index 7c22f99f0efb..a29b88ffa346 100644 --- a/arch/x86/kernel/dumpstack_32.c +++ b/arch/x86/kernel/dumpstack_32.c | |||
@@ -318,6 +318,7 @@ void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr) | |||
318 | __raw_spin_unlock(&die_lock); | 318 | __raw_spin_unlock(&die_lock); |
319 | raw_local_irq_restore(flags); | 319 | raw_local_irq_restore(flags); |
320 | 320 | ||
321 | oops_exit(); | ||
321 | if (!signr) | 322 | if (!signr) |
322 | return; | 323 | return; |
323 | 324 | ||
@@ -325,7 +326,6 @@ void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr) | |||
325 | panic("Fatal exception in interrupt"); | 326 | panic("Fatal exception in interrupt"); |
326 | if (panic_on_oops) | 327 | if (panic_on_oops) |
327 | panic("Fatal exception"); | 328 | panic("Fatal exception"); |
328 | oops_exit(); | ||
329 | do_exit(signr); | 329 | do_exit(signr); |
330 | } | 330 | } |
331 | 331 | ||