From: Don Zickus Date: Fri, 6 Jan 2012 16:17:51 +0000 (-0500) Subject: x86, reboot: Fix typo in nmi reboot path X-Git-Tag: v3.3-rc1~94^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e58d429209105e698e9d0357481d62b37fe9a7dd;p=platform%2Fkernel%2Flinux-exynos.git x86, reboot: Fix typo in nmi reboot path It was brought to my attention that my x86 change to use NMI in the reboot path broke Intel Nehalem and Westmere boxes when using kexec. I realized I had mistyped the if statement in commit 3603a2512f9e69dc87914ba922eb4a0812b21cd6 and stuck the ')' in the wrong spot. Putting it in the right spot fixes kexec again. Doh. Reported-by: Yinghai Lu Cc: Linus Torvalds Signed-off-by: Don Zickus Link: http://lkml.kernel.org/r/1325866671-9797-1-git-send-email-dzickus@redhat.com Signed-off-by: Ingo Molnar --- diff --git a/arch/x86/kernel/smp.c b/arch/x86/kernel/smp.c index 113acda..66c74f4 100644 --- a/arch/x86/kernel/smp.c +++ b/arch/x86/kernel/smp.c @@ -176,7 +176,7 @@ static void native_nmi_stop_other_cpus(int wait) */ if (num_online_cpus() > 1) { /* did someone beat us here? */ - if (atomic_cmpxchg(&stopping_cpu, -1, safe_smp_processor_id() != -1)) + if (atomic_cmpxchg(&stopping_cpu, -1, safe_smp_processor_id()) != -1) return; if (register_nmi_handler(NMI_LOCAL, smp_stop_nmi_callback,