commit 8ce5e3e45e01ffab38a9f03900181132b9068543
author Linus Torvalds <torvalds@woody.linux-foundation.org> Wed Mar 14 17:50:48 2007 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> Wed Mar 14 17:53:43 2007 -0700
tree 87dbcacd8a6279d3bea2699448bca63f12d7e9c9
parent 4e337adae4e960f64043b9f433c4a825c902616c

Disable NMI watchdog by default properly

This reverts commit 6ebf622b2577c50b1f496bd6a5e8739e55ae7b1c and
replaces it with one that actually works.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

arch/x86_64/kernel/nmi.c

diff --git a/arch/x86_64/kernel/nmi.c b/arch/x86_64/kernel/nmi.c
index 486f4c6..82d9d85 100644
--- a/arch/x86_64/kernel/nmi.c
+++ b/arch/x86_64/kernel/nmi.c
@@ -187,10 +187,7 @@
 {
 	if (nmi_watchdog != NMI_DEFAULT)
 		return;
-	if (nmi_known_cpu())
-		nmi_watchdog = NMI_LOCAL_APIC;
-	else
-		nmi_watchdog = NMI_IO_APIC;
+	nmi_watchdog = NMI_NONE;
 }
 
 static int endflag __initdata = 0;