---

yaml --- r: 99341 b: refs/heads/master c: 1966202 h: refs/heads/master i: 99339: ed4d75c v: v3
git-mirror · Jul 8, 2008 · 86586f6 · 86586f6
1 parent 1d17f4d
commit 86586f6
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git 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
@@ -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();