diff options
author | Vivek Goyal <vgoyal@in.ibm.com> | 2006-09-26 04:52:27 -0400 |
---|---|---|
committer | Andi Kleen <andi@basil.nowhere.org> | 2006-09-26 04:52:27 -0400 |
commit | 3f22c5789eb76fd9aabe4be37ba609c793f046f9 (patch) | |
tree | 01edecc58578ea4bc4771a754bb74fe704836f1d | |
parent | c7c19f8e5e564fb1a354a065befc8a88a9bb08fd (diff) |
[PATCH] kdump x86_64 nmi event notification fix
After a crash we should wait for NMI IPI event and not for external NMI or
NMI watchdog tick.
Signed-off-by: Vivek Goyal <vgoyal@in.ibm.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
-rw-r--r-- | arch/x86_64/kernel/crash.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86_64/kernel/crash.c b/arch/x86_64/kernel/crash.c index 44c8af65325e..fc57a139123e 100644 --- a/arch/x86_64/kernel/crash.c +++ b/arch/x86_64/kernel/crash.c | |||
@@ -102,7 +102,7 @@ static int crash_nmi_callback(struct notifier_block *self, | |||
102 | struct pt_regs *regs; | 102 | struct pt_regs *regs; |
103 | int cpu; | 103 | int cpu; |
104 | 104 | ||
105 | if (val != DIE_NMI) | 105 | if (val != DIE_NMI_IPI) |
106 | return NOTIFY_OK; | 106 | return NOTIFY_OK; |
107 | 107 | ||
108 | regs = ((struct die_args *)data)->regs; | 108 | regs = ((struct die_args *)data)->regs; |
@@ -114,7 +114,7 @@ static int crash_nmi_callback(struct notifier_block *self, | |||
114 | * an NMI if system was initially booted with nmi_watchdog parameter. | 114 | * an NMI if system was initially booted with nmi_watchdog parameter. |
115 | */ | 115 | */ |
116 | if (cpu == crashing_cpu) | 116 | if (cpu == crashing_cpu) |
117 | return 1; | 117 | return NOTIFY_STOP; |
118 | local_irq_disable(); | 118 | local_irq_disable(); |
119 | 119 | ||
120 | crash_save_this_cpu(regs, cpu); | 120 | crash_save_this_cpu(regs, cpu); |