diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-01-12 14:47:21 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-01-12 14:47:21 +0900 |
| commit | 53582c4c508a95ece9f7c907edef9911c7eb79eb (patch) | |
| tree | c099e9880f7bf7d60e87dfa6a19cb4e8780ec860 /drivers/char/ipmi/ipmi_watchdog.c | |
| parent | 6ae1e19dbb43ff0d429a9f45087c513212686836 (diff) | |
| parent | da97da73d418533187a8390cf6541f48bed653e8 (diff) | |
| download | talos-op-linux-53582c4c508a95ece9f7c907edef9911c7eb79eb.tar.gz talos-op-linux-53582c4c508a95ece9f7c907edef9911c7eb79eb.zip | |
Merge branch 'rmobile/sdio' into rmobile-latest
Diffstat (limited to 'drivers/char/ipmi/ipmi_watchdog.c')
| -rw-r--r-- | drivers/char/ipmi/ipmi_watchdog.c | 2 |
1 files changed, 1 insertions, 1 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) { struct die_args *args = data; - if (val != DIE_NMI) + if (val != DIE_NMIUNKNOWN) return NOTIFY_OK; /* Hack, if it's a memory or I/O error, ignore it. */ |
