diff options
-rw-r--r-- | arch/x86/kernel/apic/x2apic_uv_x.c | 2 | ||||
-rw-r--r-- | drivers/char/ipmi/ipmi_watchdog.c | 2 | ||||
-rw-r--r-- | drivers/watchdog/hpwdt.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c index c1c52c341f4..927902d90fe 100644 --- a/arch/x86/kernel/apic/x2apic_uv_x.c +++ b/arch/x86/kernel/apic/x2apic_uv_x.c | |||
@@ -639,7 +639,7 @@ void __cpuinit uv_cpu_init(void) | |||
639 | */ | 639 | */ |
640 | int uv_handle_nmi(struct notifier_block *self, unsigned long reason, void *data) | 640 | int uv_handle_nmi(struct notifier_block *self, unsigned long reason, void *data) |
641 | { | 641 | { |
642 | if (reason != DIE_NMI_IPI) | 642 | if (reason != DIE_NMIUNKNOWN) |
643 | return NOTIFY_OK; | 643 | return NOTIFY_OK; |
644 | 644 | ||
645 | if (in_crash_kexec) | 645 | if (in_crash_kexec) |
diff --git a/drivers/char/ipmi/ipmi_watchdog.c b/drivers/char/ipmi/ipmi_watchdog.c index f4d334f2536..320668f4c3a 100644 --- a/drivers/char/ipmi/ipmi_watchdog.c +++ b/drivers/char/ipmi/ipmi_watchdog.c | |||
@@ -1081,7 +1081,7 @@ ipmi_nmi(struct notifier_block *self, unsigned long val, void *data) | |||
1081 | { | 1081 | { |
1082 | struct die_args *args = data; | 1082 | struct die_args *args = data; |
1083 | 1083 | ||
1084 | if (val != DIE_NMI) | 1084 | if (val != DIE_NMIUNKNOWN) |
1085 | return NOTIFY_OK; | 1085 | return NOTIFY_OK; |
1086 | 1086 | ||
1087 | /* Hack, if it's a memory or I/O error, ignore it. */ | 1087 | /* Hack, if it's a memory or I/O error, ignore it. */ |
diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c index dea7b5bf6e2..24b966d5061 100644 --- a/drivers/watchdog/hpwdt.c +++ b/drivers/watchdog/hpwdt.c | |||
@@ -469,7 +469,7 @@ static int hpwdt_pretimeout(struct notifier_block *nb, unsigned long ulReason, | |||
469 | unsigned long rom_pl; | 469 | unsigned long rom_pl; |
470 | static int die_nmi_called; | 470 | static int die_nmi_called; |
471 | 471 | ||
472 | if (ulReason != DIE_NMI && ulReason != DIE_NMI_IPI) | 472 | if (ulReason != DIE_NMIUNKNOWN) |
473 | goto out; | 473 | goto out; |
474 | 474 | ||
475 | if (!hpwdt_nmi_decoding) | 475 | if (!hpwdt_nmi_decoding) |