From patchwork Thu Jul 14 09:10:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corneliu ZUZU X-Patchwork-Id: 9229463 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 554C860574 for ; Thu, 14 Jul 2016 09:14:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 457D82815E for ; Thu, 14 Jul 2016 09:14:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3A4F02818A; Thu, 14 Jul 2016 09:14:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id BC03C2815E for ; Thu, 14 Jul 2016 09:14:06 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bNcgF-0000Po-Gw; Thu, 14 Jul 2016 09:11:39 +0000 Received: from mail6.bemta6.messagelabs.com ([85.158.143.247]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bNcgE-0000Pe-6R for xen-devel@lists.xen.org; Thu, 14 Jul 2016 09:11:38 +0000 Received: from [85.158.143.35] by server-3.bemta-6.messagelabs.com id D3/79-22092-94757875; Thu, 14 Jul 2016 09:11:37 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrOIsWRWlGSWpSXmKPExsUSfTxjoa5HeHu 4weMzphZLPi5mcWD0OLr7N1MAYxRrZl5SfkUCa0bHuwusBSf5K+7d62FrYFzH08XIySEk4CEx +8k+pi5GLiB7LaPEjMU7WSASJxklPt0xgrDdJW60nmCBKFrNKNH26SojSIJNQFvi3KF7TCC2i IC0xLXPl8HizAL+EssO9QLFOTiEBcIlVt0JBwmzCKhKvGl+wQxi8wq4Smyd/4cdpERCQE5iwY V0kDCngJvEyvYeqBNcJd4//8oKYksI5EhcnnmeDaJcSuJ/qxJEuIdF4v/dEAhbRuLRxJtsExi FFjAyrGJUL04tKkst0jXUSyrKTM8oyU3MzNE1NDDTy00tLk5MT81JTCrWS87P3cQIDEAGINjB uPO50yFGSQ4mJVFe7f62cCG+pPyUyozE4oz4otKc1OJDjDIcHEoSvFxh7eFCgkWp6akVaZk5w FiASUtw8CiJ8JaHAqV5iwsSc4sz0yFSpxgVpcR5v4IkBEASGaV5cG2w+LvEKCslzMsIdIgQT0 FqUW5mCar8K0ZxDkYlYd77IFN4MvNK4Ka/AlrMBLTY2hxscUkiQkqqgbE4yvXfUf9Ftk8OnAn w9Y7QC4py1Nj8uWLmocy3VTuSo44p7VbfkCOu+p2r8VxXq5FEAUOz/DSmQ7O66vlcFG8s4j5/ UijTZKnFk3xlk3lVUQJvCor2fFrXvGLP/dAFB30mzfF0f5ElUM8d2faTc15XUKbfjyXRMuw3p i2O0c/d4p+8+nrGNiWW4oxEQy3mouJEAF/r4eq6AgAA X-Env-Sender: czuzu@bitdefender.com X-Msg-Ref: server-12.tower-21.messagelabs.com!1468487496!23961216!1 X-Originating-IP: [91.199.104.161] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.77; banners=-,-,- X-VirusChecked: Checked Received: (qmail 55817 invoked from network); 14 Jul 2016 09:11:36 -0000 Received: from mx01.bbu.dsd.mx.bitdefender.com (HELO mx01.bbu.dsd.mx.bitdefender.com) (91.199.104.161) by server-12.tower-21.messagelabs.com with DHE-RSA-AES128-GCM-SHA256 encrypted SMTP; 14 Jul 2016 09:11:36 -0000 Received: (qmail 24410 invoked from network); 14 Jul 2016 12:11:05 +0300 Received: from unknown (HELO mx-sr.buh.bitdefender.com) (10.17.80.103) by mx01.bbu.dsd.mx.bitdefender.com with AES256-GCM-SHA384 encrypted SMTP; 14 Jul 2016 12:11:05 +0300 Received: from smtp02.buh.bitdefender.net (unknown [10.17.80.76]) by mx-sr.buh.bitdefender.com (Postfix) with ESMTP id 7854D7FBF4 for ; Thu, 14 Jul 2016 12:11:04 +0300 (EEST) Received: (qmail 4646 invoked from network); 14 Jul 2016 12:11:04 +0300 Received: from unknown (HELO czuzu-dev-vm.clj.bitdefender.biz) (czuzu@bitdefender.com@91.199.104.243) by smtp02.buh.bitdefender.net with SMTP; 14 Jul 2016 12:11:04 +0300 From: Corneliu ZUZU To: xen-devel@lists.xen.org Date: Thu, 14 Jul 2016 12:10:25 +0300 Message-Id: <1468487425-12436-1-git-send-email-czuzu@bitdefender.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1468487370-12345-1-git-send-email-czuzu@bitdefender.com> References: <1468487370-12345-1-git-send-email-czuzu@bitdefender.com> X-BitDefender-Scanner: Clean, Agent: BitDefender qmail 3.1.6 on smtp02.buh.bitdefender.net, sigver: 7.66314 X-BitDefender-Spam: No (0) X-BitDefender-SpamStamp: Build: [Engines: 2.15.6.911, Dats: 426410, Stamp: 3], Multi: [Enabled, t: (0.000009, 0.002312)], BW: [Enabled, t: (0.000007,0.000002)], RBL DNSBL: [Disabled], APM: [Enabled, Score: 500, t: (0.002993), Flags: 85D2ED72; NN_NO_CONTENT_TYPE; NN_NO_LINK_NMD; NN_LEGIT_BITDEFENDER; NN_LEGIT_S_SQARE_BRACKETS; NN_LEGIT_MAILING_LIST_TO], SGN: [Enabled, t: (0.009764)], URL: [Enabled, t: (0.000006)], RTDA: [Enabled, t: (0.013947), Hit: No, Details: v2.3.10; Id: 2m1ghic.1aml0sh1c.1itjb], total: 0(775) X-BitDefender-CF-Stamp: none Cc: Andrew Cooper , Jan Beulich Subject: [Xen-devel] [PATCH v3 2/8] asm-x86/atomic.h: minor: proper atomic_inc_and_test() placement X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Place atomic_inc_and_test() implementation after atomic_inc(). Also empty line fix. Signed-off-by: Corneliu ZUZU Reviewed-by: Andrew Cooper --- Changed since v2: arm empty line fixes moved from here --- xen/include/asm-x86/atomic.h | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/xen/include/asm-x86/atomic.h b/xen/include/asm-x86/atomic.h index d246b70..5f9f2dd 100644 --- a/xen/include/asm-x86/atomic.h +++ b/xen/include/asm-x86/atomic.h @@ -110,7 +110,6 @@ static inline int _atomic_read(atomic_t v) return v.counter; } - /** * atomic_set - set atomic variable * @v: pointer of type atomic_t @@ -217,6 +216,25 @@ static inline void atomic_inc(atomic_t *v) } /** + * atomic_inc_and_test - increment and test + * @v: pointer of type atomic_t + * + * Atomically increments @v by 1 + * and returns true if the result is zero, or false for all + * other cases. + */ +static inline int atomic_inc_and_test(atomic_t *v) +{ + unsigned char c; + + asm volatile ( + "lock; incl %0; sete %1" + : "=m" (*(volatile int *)&v->counter), "=qm" (c) + : "m" (*(volatile int *)&v->counter) : "memory" ); + return c != 0; +} + +/** * atomic_dec - decrement atomic variable * @v: pointer of type atomic_t * @@ -250,25 +268,6 @@ static inline int atomic_dec_and_test(atomic_t *v) } /** - * atomic_inc_and_test - increment and test - * @v: pointer of type atomic_t - * - * Atomically increments @v by 1 - * and returns true if the result is zero, or false for all - * other cases. - */ -static inline int atomic_inc_and_test(atomic_t *v) -{ - unsigned char c; - - asm volatile ( - "lock; incl %0; sete %1" - : "=m" (*(volatile int *)&v->counter), "=qm" (c) - : "m" (*(volatile int *)&v->counter) : "memory" ); - return c != 0; -} - -/** * atomic_add_negative - add and test if negative * @v: pointer of type atomic_t * @i: integer value to add