diff options
Diffstat (limited to 'drivers/watchdog/hpwdt.c')
-rw-r--r-- | drivers/watchdog/hpwdt.c | 9 |
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, | |||
494 | asminline_call(&cmn_regs, cru_rom_addr); | 494 | asminline_call(&cmn_regs, cru_rom_addr); |
495 | die_nmi_called = 1; | 495 | die_nmi_called = 1; |
496 | spin_unlock_irqrestore(&rom_lock, rom_pl); | 496 | spin_unlock_irqrestore(&rom_lock, rom_pl); |
497 | |||
498 | if (allow_kdump) | ||
499 | hpwdt_stop(); | ||
500 | |||
497 | if (!is_icru) { | 501 | if (!is_icru) { |
498 | if (cmn_regs.u1.ral == 0) { | 502 | if (cmn_regs.u1.ral == 0) { |
499 | printk(KERN_WARNING "hpwdt: An NMI occurred, " | 503 | panic("An NMI occurred, " |
500 | "but unable to determine source.\n"); | 504 | "but unable to determine source.\n"); |
501 | } | 505 | } |
502 | } | 506 | } |
503 | |||
504 | if (allow_kdump) | ||
505 | hpwdt_stop(); | ||
506 | panic("An NMI occurred, please see the Integrated " | 507 | panic("An NMI occurred, please see the Integrated " |
507 | "Management Log for details.\n"); | 508 | "Management Log for details.\n"); |
508 | 509 | ||