---

yaml --- r: 99338 b: refs/heads/master c: 6fe9fe8 h: refs/heads/master v: v3
git-mirror · Jul 8, 2008 · 009907f · 009907f
1 parent 273eaf5
commit 009907f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab5a5be099cb20a1c006bf0e211c48502d7ebc44
+refs/heads/master: 6fe9fe875691e15eda61b992e03257e68aa5ba4f
diff --git a/trunk/arch/x86/kernel/smpboot.c b/trunk/arch/x86/kernel/smpboot.c
@@ -1159,10 +1159,6 @@ static int __init smp_sanity_check(unsigned max_cpus)
 	if (!max_cpus) {
 		printk(KERN_INFO "SMP mode deactivated.\n");
 		smpboot_clear_io_apic();
-
-		if (nmi_watchdog != NMI_NONE && nmi_watchdog != NMI_DISABLED)
-			nmi_watchdog = NMI_LOCAL_APIC;
-
 #ifdef CONFIG_X86_32
 		connect_bsp_APIC();
 #endif