Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7554c3f0 authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds
Browse files

[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: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 365ba917

arch/x86_64/kernel/nmi.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -151,8 +151,10 @@ int __init check_nmi_watchdog (void) 




	printk(KERN_INFO "testing NMI watchdog ... ");

	printk(KERN_INFO "testing NMI watchdog ... ");





#ifdef CONFIG_SMP

	if (nmi_watchdog == NMI_LOCAL_APIC)

	if (nmi_watchdog == NMI_LOCAL_APIC)

		smp_call_function(nmi_cpu_busy, (void *)&endflag, 0, 0);

		smp_call_function(nmi_cpu_busy, (void *)&endflag, 0, 0);

#endif





	for (cpu = 0; cpu < NR_CPUS; cpu++)

	for (cpu = 0; cpu < NR_CPUS; cpu++)

		counts[cpu] = cpu_pda(cpu)->__nmi_count;

		counts[cpu] = cpu_pda(cpu)->__nmi_count;