diff options
author | Jason Wessel <jason.wessel@windriver.com> | 2008-02-15 15:55:53 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-04-17 14:05:38 -0400 |
commit | d359752407f8916c29ad53a5c30ac73e338f2797 (patch) | |
tree | 529406a1a001a33546d7044d7d23bf8659a81962 /arch/x86/kernel/traps_32.c | |
parent | c191e5ad6b3fd8cc84b2b6d62c02fcd6837c8a8f (diff) |
kgdb: fix NMI hangs
This patch fixes the hang regression with kgdb when the NMI interrupt
comes in while the master core is returning from an exception.
Adjust the NMI logic such that KGDB will not stop NMI exceptions from
occurring by in general returning NOTIFY_DONE. It is not possible to
distinguish the debug NMI sync vs the normal NMI apic interrupt so
kgdb needs to catch the unknown NMI if it the debugger was previously
active on one of the cpus.
Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/traps_32.c')
-rw-r--r-- | arch/x86/kernel/traps_32.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/traps_32.c b/arch/x86/kernel/traps_32.c index b22c01e05a18..c5421f30d678 100644 --- a/arch/x86/kernel/traps_32.c +++ b/arch/x86/kernel/traps_32.c | |||
@@ -708,6 +708,8 @@ io_check_error(unsigned char reason, struct pt_regs * regs) | |||
708 | static __kprobes void | 708 | static __kprobes void |
709 | unknown_nmi_error(unsigned char reason, struct pt_regs * regs) | 709 | unknown_nmi_error(unsigned char reason, struct pt_regs * regs) |
710 | { | 710 | { |
711 | if (notify_die(DIE_NMIUNKNOWN, "nmi", regs, reason, 2, SIGINT) == NOTIFY_STOP) | ||
712 | return; | ||
711 | #ifdef CONFIG_MCA | 713 | #ifdef CONFIG_MCA |
712 | /* Might actually be able to figure out what the guilty party | 714 | /* Might actually be able to figure out what the guilty party |
713 | * is. */ | 715 | * is. */ |