aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/traps_64.c
diff options
context:
space:
mode:
authorJason Wessel <jason.wessel@windriver.com>2008-02-15 15:55:53 -0500
committerIngo Molnar <mingo@elte.hu>2008-04-17 14:05:38 -0400
commitd359752407f8916c29ad53a5c30ac73e338f2797 (patch)
tree529406a1a001a33546d7044d7d23bf8659a81962 /arch/x86/kernel/traps_64.c
parentc191e5ad6b3fd8cc84b2b6d62c02fcd6837c8a8f (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_64.c')
-rw-r--r--arch/x86/kernel/traps_64.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/traps_64.c b/arch/x86/kernel/traps_64.c
index 045466681911..055b1650c69d 100644
--- a/arch/x86/kernel/traps_64.c
+++ b/arch/x86/kernel/traps_64.c
@@ -806,6 +806,8 @@ io_check_error(unsigned char reason, struct pt_regs * regs)
806static __kprobes void 806static __kprobes void
807unknown_nmi_error(unsigned char reason, struct pt_regs * regs) 807unknown_nmi_error(unsigned char reason, struct pt_regs * regs)
808{ 808{
809 if (notify_die(DIE_NMIUNKNOWN, "nmi", regs, reason, 2, SIGINT) == NOTIFY_STOP)
810 return;
809 printk(KERN_EMERG "Uhhuh. NMI received for unknown reason %02x.\n", 811 printk(KERN_EMERG "Uhhuh. NMI received for unknown reason %02x.\n",
810 reason); 812 reason);
811 printk(KERN_EMERG "Do you have a strange power saving mode enabled?\n"); 813 printk(KERN_EMERG "Do you have a strange power saving mode enabled?\n");