From patchwork Wed Jul 13 14:18:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corneliu ZUZU X-Patchwork-Id: 9227699 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 B05C560572 for ; Wed, 13 Jul 2016 14:22:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A1EF626E69 for ; Wed, 13 Jul 2016 14:22:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 96ED92756B; Wed, 13 Jul 2016 14:22:31 +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 6748F26E69 for ; Wed, 13 Jul 2016 14:22:30 +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 1bNL1F-0001Y2-EK; Wed, 13 Jul 2016 14:20:09 +0000 Received: from mail6.bemta6.messagelabs.com ([85.158.143.247]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bNL1E-0001Wf-Aa for xen-devel@lists.xen.org; Wed, 13 Jul 2016 14:20:08 +0000 Received: from [85.158.143.35] by server-3.bemta-6.messagelabs.com id BA/D8-22092-71E46875; Wed, 13 Jul 2016 14:20:07 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrNIsWRWlGSWpSXmKPExsUSfTxjoa64X1u 4wYoL3BZLPi5mcWD0OLr7N1MAYxRrZl5SfkUCa8avrj+sBVeEKtpezWRpYGzn72Lk5BAS8JD4 +WorYxcjF5C9llHi5PNJLBDOSUaJ5zsuMcFUrW+/yAxXdfjOW3aQBJuAtsS5Q/fAikQEpCWuf b4MNopZYDGjxJF7HcwgCWGBcImPHatYQWwWAVWJcy2fWUBsXgEXifUzNgHZHBwSAnISCy6kg4 Q5BVwlZl2dwQKx2EWic/d9RhBbQiBH4tSiy2wQ5VIS/1uVQFZJCCxjkbj68jcTRI2MxKOJN9k mMAotYGRYxahenFpUllqka6yXVJSZnlGSm5iZo2toYKaXm1pcnJiempOYVKyXnJ+7iREYiAxA sIOx45/TIUZJDiYlUd7Oua3hQnxJ+SmVGYnFGfFFpTmpxYcYZTg4lCR4n/q0hQsJFqWmp1akZ eYAYwImLcHBoyTCW+kNlOYtLkjMLc5Mh0idYlSUEuddCdInAJLIKM2Da4PF4SVGWSlhXkagQ4 R4ClKLcjNLUOVfMYpzMCoJ8z4HmcKTmVcCN/0V0GImoMW1Ds0gi0sSEVJSDYzCE1826Lcr2Gz eY3uveQFrxDW7Q6VTj+hEWa6fep957fTyecnPuZ/UvzFnaA1fy+zleGT7+SPCPmUv7u/eqq69 9fEbJeFrMg96i/8dEFZ5ffInI7fXxyVPYs+9rT+p8EPsmj6frtai/oQtK7cd+P3v1MUUiwPe5 ssk062jguYWhE1rrfMWmf5NiaU4I9FQi7moOBEAKYSWi74CAAA= X-Env-Sender: czuzu@bitdefender.com X-Msg-Ref: server-5.tower-21.messagelabs.com!1468419606!23718233!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 56165 invoked from network); 13 Jul 2016 14:20:07 -0000 Received: from mx01.bbu.dsd.mx.bitdefender.com (HELO mx01.bbu.dsd.mx.bitdefender.com) (91.199.104.161) by server-5.tower-21.messagelabs.com with DHE-RSA-AES128-GCM-SHA256 encrypted SMTP; 13 Jul 2016 14:20:07 -0000 Received: (qmail 13563 invoked from network); 13 Jul 2016 17:20: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; 13 Jul 2016 17:20:05 +0300 Received: from smtp03.buh.bitdefender.org (unknown [10.17.80.77]) by mx-sr.buh.bitdefender.com (Postfix) with ESMTP id 22D917FC06 for ; Wed, 13 Jul 2016 17:20:05 +0300 (EEST) Received: (qmail 21629 invoked from network); 13 Jul 2016 17:20:05 +0300 Received: from 188-24-57-61.rdsnet.ro (HELO localhost.localdomain) (czuzu@bitdefender.com@188.24.57.61) by smtp03.buh.bitdefender.org with SMTP; 13 Jul 2016 17:20:05 +0300 From: Corneliu ZUZU To: xen-devel@lists.xen.org Date: Wed, 13 Jul 2016 17:18:58 +0300 Message-Id: <1468419538-2737-1-git-send-email-czuzu@bitdefender.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1468419495-2646-1-git-send-email-czuzu@bitdefender.com> References: <1468419495-2646-1-git-send-email-czuzu@bitdefender.com> X-BitDefender-Scanner: Clean, Agent: BitDefender qmail 3.1.6 on smtp03.buh.bitdefender.org, sigver: 7.66302 X-BitDefender-Spam: No (0) X-BitDefender-SpamStamp: Build: [Engines: 2.15.6.911, Dats: 426298, Stamp: 3], Multi: [Enabled, t: (0.000009, 0.003285)], BW: [Enabled, t: (0.000010,0.000001)], RBL DNSBL: [Disabled], APM: [Enabled, Score: 500, t: (0.003337), Flags: 85D2ED72; NN_NO_CONTENT_TYPE; NN_LEGIT_SUMM_400_WORDS; NN_NO_LINK_NMD; NN_LEGIT_BITDEFENDER; NN_LEGIT_S_SQARE_BRACKETS; NN_LEGIT_MAILING_LIST_TO], SGN: [Enabled, t: (0.012012)], URL: [Enabled, t: (0.000005)], RTDA: [Enabled, t: (0.058557), Hit: No, Details: v2.3.10; Id: 2m1ghic.1aml0sh1c.1fhg4], total: 0(775) X-BitDefender-CF-Stamp: none Cc: Andrew Cooper , Julien Grall , Stefano Stabellini , Jan Beulich Subject: [Xen-devel] [PATCH v2 2/5] 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 remove unneeded empty line and add a needed one. Signed-off-by: Corneliu ZUZU Acked-by: Stefano Stabellini --- xen/include/asm-arm/atomic.h | 1 + xen/include/asm-x86/atomic.h | 39 +++++++++++++++++++-------------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/xen/include/asm-arm/atomic.h b/xen/include/asm-arm/atomic.h index 41d1b6c..19a87a5 100644 --- a/xen/include/asm-arm/atomic.h +++ b/xen/include/asm-arm/atomic.h @@ -150,6 +150,7 @@ static inline void _atomic_set(atomic_t *v, int i) #define atomic_add_negative(i,v) (atomic_add_return(i, v) < 0) #endif /* __ARCH_ARM_ATOMIC__ */ + /* * Local variables: * mode: C 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