From fe2f3cd4024d2babb5bb0e2b723d2fd03ecf67b4 Mon Sep 17 00:00:00 2001
From: Naga Chumbalkar <nagananda.chumbalkar@hp.com>
Date: Tue, 9 Aug 2011 22:27:26 +0000
Subject: [PATCH] --- yaml --- r: 263992 b: refs/heads/master c:
 dbc018eca386b4e2670fc3116feada19f3db664c h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/watchdog/hpwdt.c | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 65ebf8358ced..47d0139e6b03 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cb7efc02c6dbc3bfe9d5d1509ed790fc757e05a9
+refs/heads/master: dbc018eca386b4e2670fc3116feada19f3db664c
diff --git a/trunk/drivers/watchdog/hpwdt.c b/trunk/drivers/watchdog/hpwdt.c
index 410fba45378d..809cbda03d7a 100644
--- a/trunk/drivers/watchdog/hpwdt.c
+++ b/trunk/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");