From 90828dc1baa14e06721068489c985d7624f2b59e Mon Sep 17 00:00:00 2001
From: "Maciej W. Rozycki" <macro@linux-mips.org>
Date: Fri, 11 Jul 2008 19:47:15 +0100
Subject: [PATCH] --- yaml --- r: 100127 b: refs/heads/master c:
 5b4d2386c23e5de553fce002892c7691a989b350 h: refs/heads/master i:   100125:
 08b70b5ae774b67c81d14c49295ad298f03bf3c6   100123:
 abf17e6b40ceb663f3af255f74e0ffe470364db9   100119:
 f4cac1bde2ccf6a724cdf2bafab08f40c0f78abc   100111:
 4d2721c0ff45d8f4498e6d7ef1e3a3d9bc4a229c   100095:
 982d6d68b6256addcc18f28b5946ef6727ce75fd v: v3

---
 [refs]                      | 2 +-
 trunk/arch/x86/kernel/nmi.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b98774e441c0..fe31ef3519a2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: af174783b9251f0afd4bb78927221bcaaa65d3ac
+refs/heads/master: 5b4d2386c23e5de553fce002892c7691a989b350
diff --git a/trunk/arch/x86/kernel/nmi.c b/trunk/arch/x86/kernel/nmi.c
index 8dfe9db87a9e..716b89284be0 100644
--- a/trunk/arch/x86/kernel/nmi.c
+++ b/trunk/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;
 }