From: Ingo Molnar <mingo@elte.hu>
Date: Sun, 8 Jun 2008 08:14:40 +0000 (+0200)
Subject: Revert "x86: APIC/SMP: downgrade the NMI watchdog for "nosmp""
X-Git-Tag: v2.6.27-rc1~1106^2~251^2~11
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6fe9fe875691e15eda61b992e03257e68aa5ba4f;p=linux-2.6

Revert "x86: APIC/SMP: downgrade the NMI watchdog for "nosmp""

This reverts commit 791b93d3dfaf16c23e978bec0cc0a3dd9d855d63.

A better fix from Maciej will be merged.
---

diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index df60bc7c9c..8c53d86e3e 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/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