> From: Don Zickus <dzickus@xxxxxxxxxx> > Date: Thu, 5 Jan 2012 13:06:58 -0500 > Subject: [PATCH] x86, reboot: 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 <yinghai@xxxxxxxxxx> > Signed-off-by: Don Zickus <dzickus@xxxxxxxxxx> Tested-by: Yinghai Lu <yinghai@xxxxxxxxxx> > --- > arch/x86/kernel/smp.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/arch/x86/kernel/smp.c b/arch/x86/kernel/smp.c > index e72b175..3f3d3f0 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, > -- > 1.7.7.4 > -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html