diff options
| author | Mingarelli, Thomas <Thomas.Mingarelli@hp.com> | 2012-06-26 10:27:00 +0200 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2012-06-28 20:40:31 +0200 |
| commit | a089361cf5f1d6a5295aa5385238bd044998e1e9 (patch) | |
| tree | bbe11e21e5d15b2a1085685499bbb96b91b60428 /drivers/watchdog | |
| parent | e5de32e3ec9d4d5a355659760d5045b80c0a05d8 (diff) | |
| download | linux-stable-a089361cf5f1d6a5295aa5385238bd044998e1e9.tar.gz linux-stable-a089361cf5f1d6a5295aa5385238bd044998e1e9.tar.bz2 linux-stable-a089361cf5f1d6a5295aa5385238bd044998e1e9.zip | |
watchdog: hpwdt: Unregister NMI events on exit.
This patch is to unregister for NMI events upon exit. Also we are now
making the default setting for allow_kdump enabled.
Signed-off-by: Thomas Mingarelli <thomas.mingarelli@hp.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog')
| -rw-r--r-- | drivers/watchdog/hpwdt.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c index 2b763815aeec..1eff743ec497 100644 --- a/drivers/watchdog/hpwdt.c +++ b/drivers/watchdog/hpwdt.c @@ -146,7 +146,7 @@ struct cmn_registers { } __attribute__((packed)); static unsigned int hpwdt_nmi_decoding; -static unsigned int allow_kdump; +static unsigned int allow_kdump = 1; static unsigned int is_icru; static DEFINE_SPINLOCK(rom_lock); static void *cru_rom_addr; @@ -756,6 +756,8 @@ error: static void hpwdt_exit_nmi_decoding(void) { unregister_nmi_handler(NMI_UNKNOWN, "hpwdt"); + unregister_nmi_handler(NMI_SERR, "hpwdt"); + unregister_nmi_handler(NMI_IO_CHECK, "hpwdt"); if (cru_rom_addr) iounmap(cru_rom_addr); } |