X-Git-Url: http://git.cascardo.info/?a=blobdiff_plain;f=arch%2Fx86_64%2Fkernel%2Fnmi.c;h=82d9d85d52709c2322392a5e33e5768b0c8dc085;hb=8ce5e3e45e01ffab38a9f03900181132b9068543;hp=486f4c61a948851f3b729a646da78e679e689341;hpb=4e337adae4e960f64043b9f433c4a825c902616c;p=cascardo%2Flinux.git

diff --git a/arch/x86_64/kernel/nmi.c b/arch/x86_64/kernel/nmi.c
index 486f4c61a948..82d9d85d5270 100644
--- a/arch/x86_64/kernel/nmi.c
+++ b/arch/x86_64/kernel/nmi.c
@@ -187,10 +187,7 @@ void nmi_watchdog_default(void)
 {
 	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;