[PATCH] x86: Recover timer_ack lost in the merge of the NMI watchdog

[Maciej W. Rozycki]

 In the course of the recent unification of the NMI watchdog an assignment
to timer_ack to switch off unnecesary POLL commands to the 8259A in the
case of a watchdog failure has been accidentally removed.  The statement
used to be limited to the 32-bit variation as since the rewrite of the
timer code it has been relevant for the 82489DX only.  This change brings
it back.

Signed-off-by: Maciej W. Rozycki <macro@xxxxxxxxxxxxxx>
---
patch-next-2.6.26-rc9-20080710-nmi-timer_ack-2
diff -up --recursive --new-file linux-next-2.6.26-rc9-20080710.macro/arch/x86/kernel/nmi.c linux-next-2.6.26-rc9-20080710/arch/x86/kernel/nmi.c
--- linux-next-2.6.26-rc9-20080710.macro/arch/x86/kernel/nmi.c	2008-07-11 02:57:31.000000000 +0000
+++ linux-next-2.6.26-rc9-20080710/arch/x86/kernel/nmi.c	2008-07-11 03:20:33.000000000 +0000
@@ -171,6 +171,9 @@ int __init check_nmi_watchdog(void)
 error:
 	if (nmi_watchdog == NMI_IO_APIC && !timer_through_8259)
 		disable_8259A_irq(0);
+#ifdef CONFIG_X86_32
+	timer_ack = 0;
+#endif
 	return -1;
 }
 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/