---

yaml --- r: 17993 b: refs/heads/master c: 7554c3f h: refs/heads/master i: 17991: 56e0014 v: v3
git-mirror · Jan 12, 2006 · 410d3c4 · 410d3c4
1 parent e495b17
commit 410d3c4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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;