Commit dbc018ec authored Aug 09, 2011 by Naga Chumbalkar Committed by Wim Van Sebroeck Sep 20, 2011

watchdog: hpwdt: prevent multiple "NMI occurred" messages

On platforms with no iCRU support don't print two, (possibly conflicting),
"NMI occurred" messages when the firmware is unable to source the NMI.

Please note that one of the enhancements to the v1.3.0 hpwdt driver is to panic and allow
KDUMP to succeed even on NMIs that are unknown to the platform firmware.

Signed-off-by: Naga Chumbalkar <nagananda.chumbalkar@hp.com>
Reviewed-by: Thomas Mingarelli <thomas.mingarelli@hp.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>

parent cb7efc02

drivers/watchdog/hpwdt.c

+5 −4

Original line number	Diff line number	Diff line
		@@ -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");

Admin message