From: Maciej W. Rozycki <macro@linux-mips.org>
Date: Fri, 11 Jul 2008 18:47:15 +0000 (+0100)
Subject: x86: Recover timer_ack lost in the merge of the NMI watchdog
X-Git-Tag: v2.6.27-rc1~1106^2~15
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=5b4d2386c23e5de553fce002892c7691a989b350;p=linux-2.6-omap-h63xx.git

x86: Recover timer_ack lost in the merge of the NMI watchdog

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@linux-mips.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
index 8dfe9db87a9..716b89284be 100644
--- a/arch/x86/kernel/nmi.c
+++ b/arch/x86/kernel/nmi.c
@@ -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;
 }