summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog/hpwdt.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-10-20 18:32:02 +0200
committerArnd Bergmann <arnd@arndb.de>2011-10-20 18:32:02 +0200
commit91056a63a7d8dbc817747a22d9a9490463323575 (patch)
treea220d265d01075c05f4cd35d998e65849bb47bc8 /drivers/watchdog/hpwdt.c
parentMerge branches 'cleanups/mx3-mm-v2' and 'cleanups/mxs' into imx-cleanup (diff)
parentMerge branches 'cleanups/mxs', 'cleanups/mx3-defconfig' and 'cleanups/include... (diff)
downloadlinux-91056a63a7d8dbc817747a22d9a9490463323575.tar.xz
linux-91056a63a7d8dbc817747a22d9a9490463323575.zip
Merge branch 'imx-cleanups-for-arnd' of git://git.pengutronix.de/git/imx/linux-2.6 into imx/cleanup
Diffstat (limited to 'drivers/watchdog/hpwdt.c')
-rw-r--r--drivers/watchdog/hpwdt.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c
index 410fba45378d..809cbda03d7a 100644
--- a/drivers/watchdog/hpwdt.c
+++ b/drivers/watchdog/hpwdt.c
@@ -494,15 +494,16 @@ static int hpwdt_pretimeout(struct notifier_block *nb, unsigned long ulReason,
asminline_call(&cmn_regs, cru_rom_addr);
die_nmi_called = 1;
spin_unlock_irqrestore(&rom_lock, rom_pl);
+
+ if (allow_kdump)
+ hpwdt_stop();
+
if (!is_icru) {
if (cmn_regs.u1.ral == 0) {
- printk(KERN_WARNING "hpwdt: An NMI occurred, "
+ panic("An NMI occurred, "
"but unable to determine source.\n");
}
}
-
- if (allow_kdump)
- hpwdt_stop();
panic("An NMI occurred, please see the Integrated "
"Management Log for details.\n");