x86, reboot: Fix typo in nmi reboot path
authorDon Zickus <dzickus@redhat.com>
Fri, 6 Jan 2012 16:17:51 +0000 (11:17 -0500)
committerIngo Molnar <mingo@elte.hu>
Sat, 7 Jan 2012 11:19:37 +0000 (12:19 +0100)
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 <yinghai@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Don Zickus <dzickus@redhat.com>
Link: http://lkml.kernel.org/r/1325866671-9797-1-git-send-email-dzickus@redhat.com
Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/smp.c

index 113acda5879eb9dd88550ca42ce16cea28195d0f..66c74f481cab36bca09f95aa68b98160a41a1fbc 100644 (file)
@@ -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,