git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
watchdog: hpwdt: Unregister NMI events on exit.
[pandora-kernel.git]
/
drivers
/
watchdog
/
hpwdt.c
diff --git
a/drivers/watchdog/hpwdt.c
b/drivers/watchdog/hpwdt.c
index
2b76381
..
1eff743
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;
} __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;
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");
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);
}
if (cru_rom_addr)
iounmap(cru_rom_addr);
}