lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
The old setup works better.

Signed-off-by: Thomas Mingarelli <Thomas.Mingarelli@hp.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
This commit is contained in:
Wim Van Sebroeck
2008-06-18 16:22:48 +00:00
parent 4dc7347a3b
commit fdf7be6f13
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/watchdog/hpwdt.c
View File

@@ -418,20 +418,23 @@ static int hpwdt_pretimeout(struct notifier_block *nb, unsigned long ulReason,
static unsigned long rom_pl; static unsigned long rom_pl;
static int die_nmi_called; static int die_nmi_called;
if (ulReason == DIE_NMI || ulReason == DIE_NMI_IPI) { if (ulReason != DIE_NMI && ulReason != DIE_NMI_IPI)
spin_lock_irqsave(&rom_lock, rom_pl); return NOTIFY_OK;
if (!die_nmi_called)
asminline_call(&cmn_regs, cru_rom_addr); spin_lock_irqsave(&rom_lock, rom_pl);
die_nmi_called = 1; if (!die_nmi_called)
spin_unlock_irqrestore(&rom_lock, rom_pl); asminline_call(&cmn_regs, cru_rom_addr);
if (cmn_regs.u1.ral != 0) { die_nmi_called = 1;
panic("An NMI occurred, please see the Integrated " spin_unlock_irqrestore(&rom_lock, rom_pl);
"Management Log for details.\n"); 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_STOP;
return NOTIFY_DONE;
} }
/* /*