diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/char/ipmi/ipmi_watchdog.c | 2 | ||||
-rw-r--r-- | drivers/watchdog/hpwdt.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/ipmi/ipmi_watchdog.c b/drivers/char/ipmi/ipmi_watchdog.c index f4d334f2536e..320668f4c3aa 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 dea7b5bf6e2c..24b966d5061a 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) |