2006-05-15 17:48:59

by Vivek Goyal

[permalink] [raw]
Subject: [PATCH] kdump x86_64 nmi event notification fix



o After a crash we should wait for NMI IPI event and not for external NMI
or NMI watchdog tick.

Signed-off-by: Vivek Goyal <[email protected]>
---

linux-2.6.17-rc4-1M-vivek/arch/x86_64/kernel/crash.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff -puN arch/x86_64/kernel/crash.c~kdump-x86_64-nmi-event-notification-fix arch/x86_64/kernel/crash.c
--- linux-2.6.17-rc4-1M/arch/x86_64/kernel/crash.c~kdump-x86_64-nmi-event-notification-fix 2006-05-15 13:26:41.000000000 -0400
+++ linux-2.6.17-rc4-1M-vivek/arch/x86_64/kernel/crash.c 2006-05-15 13:27:02.000000000 -0400
@@ -102,7 +102,7 @@ static int crash_nmi_callback(struct not
struct pt_regs *regs;
int cpu;

- if (val != DIE_NMI)
+ if (val != DIE_NMI_IPI)
return NOTIFY_OK;

regs = ((struct die_args *)data)->regs;
@@ -114,7 +114,7 @@ static int crash_nmi_callback(struct not
* an NMI if system was initially booted with nmi_watchdog parameter.
*/
if (cpu == crashing_cpu)
- return 1;
+ return NOTIFY_STOP;
local_irq_disable();

crash_save_this_cpu(regs, cpu);
_