From d98979a64fc3c6d47318950be28ae1d50a2ef3ca Mon Sep 17 00:00:00 2001
From: "Maciej W. Rozycki" <macro@linux-mips.org>
Date: Wed, 21 May 2008 22:10:16 +0100
Subject: [PATCH] --- yaml --- r: 99321 b: refs/heads/master c:
 a1133d8e4ffc2db751eb987a2f3cf8ead67927c3 h: refs/heads/master i:   99319:
 35b62ec32b30a922fbd7922d5a42c220edce52df v: v3

---
 [refs]                          | 2 +-
 trunk/arch/x86/kernel/smpboot.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 812216649121..c0f2547413f9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 73d08e636026bbcb413d4864ca5e917502f8a0f9
+refs/heads/master: a1133d8e4ffc2db751eb987a2f3cf8ead67927c3
diff --git a/trunk/arch/x86/kernel/smpboot.c b/trunk/arch/x86/kernel/smpboot.c
index 8c53d86e3e86..df60bc7c9cb7 100644
--- a/trunk/arch/x86/kernel/smpboot.c
+++ b/trunk/arch/x86/kernel/smpboot.c
@@ -1159,6 +1159,10 @@ 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