summaryrefslogtreecommitdiffstats
path: root/arch/x86_64
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2006-01-11 22:45:45 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-11 19:04:59 -0800
commit7554c3f0e378161fb6315160d6c3e23bf2de5869 (patch)
tree9e7b3679fbf08c11dd2629b6dd1e84931468a746 /arch/x86_64
parent365ba9179f84244d2ffa98e46ae3cddfeb2ef6ff (diff)
downloadlinux-7554c3f0e378161fb6315160d6c3e23bf2de5869.tar.bz2
[PATCH] x86_64: Fix warning in nmi.c on uniprocessor kernels
Fix CC arch/x86_64/kernel/nmi.o linux/arch/x86_64/kernel/nmi.c: In function ???check_nmi_watchdog???: linux/arch/x86_64/kernel/nmi.c:155: warning: statement with no effect on Uniprocessor builds. Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/x86_64')
-rw-r--r--arch/x86_64/kernel/nmi.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86_64/kernel/nmi.c b/arch/x86_64/kernel/nmi.c
index 40575d83d12f..5fae6f0cd994 100644
--- a/arch/x86_64/kernel/nmi.c
+++ b/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;