From 410d3c42a92fd800b4f71695ecb60e9f5ca10648 Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@suse.de>
Date: Wed, 11 Jan 2006 22:45:45 +0100
Subject: [PATCH] --- yaml --- r: 17993 b: refs/heads/master c:
 7554c3f0e378161fb6315160d6c3e23bf2de5869 h: refs/heads/master i:   17991:
 56e001475acd2383ee5074c32a02bca80b68179f v: v3

---
 [refs]                         | 2 +-
 trunk/arch/x86_64/kernel/nmi.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ce2a05303cbd..917f642aba78 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 365ba9179f84244d2ffa98e46ae3cddfeb2ef6ff
+refs/heads/master: 7554c3f0e378161fb6315160d6c3e23bf2de5869
diff --git a/trunk/arch/x86_64/kernel/nmi.c b/trunk/arch/x86_64/kernel/nmi.c
index 40575d83d12f..5fae6f0cd994 100644
--- a/trunk/arch/x86_64/kernel/nmi.c
+++ b/trunk/arch/x86_64/kernel/nmi.c
@@ -151,8 +151,10 @@ int __init check_nmi_watchdog (void)
 
 	printk(KERN_INFO "testing NMI watchdog ... ");
 
+#ifdef CONFIG_SMP
 	if (nmi_watchdog == NMI_LOCAL_APIC)
 		smp_call_function(nmi_cpu_busy, (void *)&endflag, 0, 0);
+#endif
 
 	for (cpu = 0; cpu < NR_CPUS; cpu++)
 		counts[cpu] = cpu_pda(cpu)->__nmi_count;