From: Andi Kleen Date: Wed, 11 Jan 2006 21:45:45 +0000 (+0100) Subject: [PATCH] x86_64: Fix warning in nmi.c on uniprocessor kernels X-Git-Tag: v2.6.16-rc1~313 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=7554c3f0e378161fb6315160d6c3e23bf2de5869;p=linux-2.6-omap-h63xx.git [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 Signed-off-by: Linus Torvalds --- diff --git a/arch/x86_64/kernel/nmi.c b/arch/x86_64/kernel/nmi.c index 40575d83d12..5fae6f0cd99 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;