---

yaml --- r: 100127 b: refs/heads/master c: 5b4d238 h: refs/heads/master i: 100125: 08b70b5 100123: abf17e6 100119: f4cac1b 100111: 4d2721c 100095: 982d6d6 v: v3
git-mirror · Jul 11, 2008 · 90828dc · 90828dc
1 parent 9098109
commit 90828dc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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;
 }