Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fdf7be6f authored by Wim Van Sebroeck's avatar Wim Van Sebroeck
Browse files

Revert "[WATCHDOG] hpwdt: Fix NMI handling." 



The old setup works better.

Signed-off-by: default avatarThomas Mingarelli <Thomas.Mingarelli@hp.com>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent 4dc7347a

drivers/watchdog/hpwdt.c

+15 −12
Original line number Diff line number Diff line
@@ -418,20 +418,23 @@ static int hpwdt_pretimeout(struct notifier_block *nb, unsigned long ulReason, 
	static unsigned long rom_pl;

	static int die_nmi_called;



	if (ulReason == DIE_NMI || ulReason == DIE_NMI_IPI) {

	if (ulReason != DIE_NMI && ulReason != DIE_NMI_IPI)

		return NOTIFY_OK;



	spin_lock_irqsave(&rom_lock, rom_pl);

	if (!die_nmi_called)

		asminline_call(&cmn_regs, cru_rom_addr);

	die_nmi_called = 1;

	spin_unlock_irqrestore(&rom_lock, rom_pl);

		if (cmn_regs.u1.ral != 0) {

	if (cmn_regs.u1.ral == 0) {

		printk(KERN_WARNING "hpwdt: An NMI occurred, "

		       "but unable to determine source.\n");

	} else {

		panic("An NMI occurred, please see the Integrated "

			"Management Log for details.\n");

	}

	}



	die_nmi_called = 0;

	return NOTIFY_DONE;

	return NOTIFY_STOP;

}



/*