diff options
author | Mingarelli, Thomas <Thomas.Mingarelli@hp.com> | 2012-06-26 04:27:00 -0400 |
---|---|---|
committer | Wim Van Sebroeck <wim@iguana.be> | 2012-06-28 14:40:31 -0400 |
commit | a089361cf5f1d6a5295aa5385238bd044998e1e9 (patch) | |
tree | bbe11e21e5d15b2a1085685499bbb96b91b60428 /drivers | |
parent | e5de32e3ec9d4d5a355659760d5045b80c0a05d8 (diff) |
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')
-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 2b763815aee..1eff743ec49 100644 --- a/drivers/watchdog/hpwdt.c +++ b/drivers/watchdog/hpwdt.c | |||
@@ -146,7 +146,7 @@ struct cmn_registers { | |||
146 | } __attribute__((packed)); | 146 | } __attribute__((packed)); |
147 | 147 | ||
148 | static unsigned int hpwdt_nmi_decoding; | 148 | static unsigned int hpwdt_nmi_decoding; |
149 | static unsigned int allow_kdump; | 149 | static unsigned int allow_kdump = 1; |
150 | static unsigned int is_icru; | 150 | static unsigned int is_icru; |
151 | static DEFINE_SPINLOCK(rom_lock); | 151 | static DEFINE_SPINLOCK(rom_lock); |
152 | static void *cru_rom_addr; | 152 | static void *cru_rom_addr; |
@@ -756,6 +756,8 @@ error: | |||
756 | static void hpwdt_exit_nmi_decoding(void) | 756 | static void hpwdt_exit_nmi_decoding(void) |
757 | { | 757 | { |
758 | unregister_nmi_handler(NMI_UNKNOWN, "hpwdt"); | 758 | unregister_nmi_handler(NMI_UNKNOWN, "hpwdt"); |
759 | unregister_nmi_handler(NMI_SERR, "hpwdt"); | ||
760 | unregister_nmi_handler(NMI_IO_CHECK, "hpwdt"); | ||
759 | if (cru_rom_addr) | 761 | if (cru_rom_addr) |
760 | iounmap(cru_rom_addr); | 762 | iounmap(cru_rom_addr); |
761 | } | 763 | } |