From 86586f6f192a126d00cf2e3da6fe99078e88dc3c Mon Sep 17 00:00:00 2001
From: "Maciej W. Rozycki" <macro@linux-mips.org>
Date: Fri, 6 Jun 2008 03:27:56 +0100
Subject: [PATCH] --- yaml --- r: 99341 b: refs/heads/master c:
 19662027488946e34dd54d3bb408fa3307681d7d h: refs/heads/master i:   99339:
 ed4d75cfbcfb84de0897b087bcdc38d14f89a92a v: v3

---
 [refs]                          | 2 +-
 trunk/arch/x86/kernel/apic_32.c | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index c629a358bae1..479948519da2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: acae7d906f2f81d814e9c3730eeb19dfd3bf3bb4
+refs/heads/master: 19662027488946e34dd54d3bb408fa3307681d7d
diff --git a/trunk/arch/x86/kernel/apic_32.c b/trunk/arch/x86/kernel/apic_32.c
index 26e7a62e9ab6..126e87153b39 100644
--- a/trunk/arch/x86/kernel/apic_32.c
+++ b/trunk/arch/x86/kernel/apic_32.c
@@ -1154,9 +1154,6 @@ static int __init detect_init_APIC(void)
 	if (l & MSR_IA32_APICBASE_ENABLE)
 		mp_lapic_addr = l & MSR_IA32_APICBASE_BASE;
 
-	if (nmi_watchdog != NMI_NONE && nmi_watchdog != NMI_DISABLED)
-		nmi_watchdog = NMI_LOCAL_APIC;
-
 	printk(KERN_INFO "Found and enabled local APIC!\n");
 
 	apic_pm_activate();