From 8623e0117662bee3baa53efb5ea72431e06c2b03 Mon Sep 17 00:00:00 2001 From: Don Zickus Date: Fri, 6 Jan 2012 11:17:51 -0500 Subject: [PATCH] --- yaml --- r: 283550 b: refs/heads/master c: e58d429209105e698e9d0357481d62b37fe9a7dd h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/smp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 59b2323c8a86..6ec39741915e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3d6240b53e34e372be007e08f7066e7625910675 +refs/heads/master: e58d429209105e698e9d0357481d62b37fe9a7dd diff --git a/trunk/arch/x86/kernel/smp.c b/trunk/arch/x86/kernel/smp.c index 113acda5879e..66c74f481cab 100644 --- a/trunk/arch/x86/kernel/smp.c +++ b/trunk/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,