projects
/
GitHub
/
MotorolaMobilityLLC
/
kernel-slsi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e5de32e
)
watchdog: hpwdt: Unregister NMI events on exit.
author
Mingarelli, Thomas
<Thomas.Mingarelli@hp.com>
Tue, 26 Jun 2012 08:27:00 +0000
(10:27 +0200)
committer
Wim Van Sebroeck
<wim@iguana.be>
Thu, 28 Jun 2012 18:40:31 +0000
(20:40 +0200)
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>
drivers/watchdog/hpwdt.c
patch
|
blob
|
blame
|
history
diff --git
a/drivers/watchdog/hpwdt.c
b/drivers/watchdog/hpwdt.c
index 2b763815aeecc90ebad7fdf36f17de949d365bfd..1eff743ec4970071f8451704fb51d4b06de70950 100644
(file)
--- 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);
}