Commit e58d4292 authored by Don Zickus's avatar Don Zickus Committed by Ingo Molnar

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
3603a251 and stuck the ')' in
the wrong spot.  Putting it in the right spot fixes kexec again.

Doh.
Reported-by: default avatarYinghai Lu <yinghai@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarDon Zickus <dzickus@redhat.com>
Link: http://lkml.kernel.org/r/1325866671-9797-1-git-send-email-dzickus@redhat.comSigned-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 3d6240b5
...@@ -176,7 +176,7 @@ static void native_nmi_stop_other_cpus(int wait) ...@@ -176,7 +176,7 @@ static void native_nmi_stop_other_cpus(int wait)
*/ */
if (num_online_cpus() > 1) { if (num_online_cpus() > 1) {
/* did someone beat us here? */ /* 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; return;
if (register_nmi_handler(NMI_LOCAL, smp_stop_nmi_callback, if (register_nmi_handler(NMI_LOCAL, smp_stop_nmi_callback,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment