Attachment 299040 Details for Bug 438741 – RHEL5 fix for this issue

[patch] RHEL5 fix for this issue

438741.patch (text/plain), 1.22 KB, created by Prarit Bhargava on 2008-03-25 15:37:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Prarit Bhargava

Created: 2008-03-25 15:37:56 UTC

Size: 1.22 KB

patch

obsolete

>Since the system NMI handler runs every 30 seconds, the HP watchdog handler
>will examine an interrupt at least every 30 seconds.
>
>The existing code spits out a message every 30 seconds saying that "An NMI
>occurred, but unable to determine source."  Users really don't care.
>
>Additionally, returning NOTIFY_STOP from this function results in the NMI
>being disabled.  Return NOTIFY_DONE, which is a more appropriate thing to do.
>
>Resolves BZ 438741.
>
>diff --git a/drivers/char/watchdog/hpwdt.c b/drivers/char/watchdog/hpwdt.c
>index 078c954..5b98188 100644
>--- a/drivers/char/watchdog/hpwdt.c
>+++ b/drivers/char/watchdog/hpwdt.c
>@@ -615,15 +615,14 @@ static int hpwdt_pretimeout(struct notifier_block *nb, unsigned long ulReason,
> 			asminline_call(&cmn_regs, gpVirtRomCRUAddr);
> 		die_nmi_called = 1;
> 		spin_unlock_irqrestore(&rom_lock, rom_pl);
>-		if (cmn_regs.u1.ral == 0) {
>-			printk(KERN_WARNING "hpwdt: An NMI occurred, "
>-			       "but unable to determine source.\n");
>-		} else {
>+		if (cmn_regs.u1.ral != 0) {
> 			panic("An NMI occurred, please see the Integrated "
>-				"Management Log for details.\n");
>+			       "Management Log for details.\n");
> 		}
> 	}
>-	return NOTIFY_STOP;
>+
>+	die_nmi_called = 0;
>+	return NOTIFY_DONE;
> }
> 
> /*

Actions: View | Diff

Attachments on bug 438741: 298930 | 299040 | 299947