From patchwork Thu Jul 14 09:09:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corneliu ZUZU X-Patchwork-Id: 9229461 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 D9FC160574 for ; Thu, 14 Jul 2016 09:13:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C90812815E for ; Thu, 14 Jul 2016 09:13:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BC23C2818A; Thu, 14 Jul 2016 09:13: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 955AB2815E for ; Thu, 14 Jul 2016 09:13:05 +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 1bNcfG-0000Jk-7C; Thu, 14 Jul 2016 09:10:38 +0000 Received: from mail6.bemta6.messagelabs.com ([85.158.143.247]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bNcfE-0000Jd-Nn for xen-devel@lists.xen.org; Thu, 14 Jul 2016 09:10:36 +0000 Received: from [85.158.143.35] by server-3.bemta-6.messagelabs.com id CE/66-22092-B0757875; Thu, 14 Jul 2016 09:10:35 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrMIsWRWlGSWpSXmKPExsUSfTxjoS53eHu 4wc4pshZLPi5mcWD0OLr7N1MAYxRrZl5SfkUCa8axLdkF6+Uqfk2Ua2CcJdXFyMkhJOAh8Wjt W8YuRi4gey2jxJ0nU1ggnJOMErOv7WSFqHKX2N16iRkisZpR4vWVnywgCTYBbYlzh+4xgdgiA tIS1z5fZgSxmQVCJab+fQBUw8EhLOAjsfWOLkiYRUBV4tycXnYQm1fAVeL4+p/MICUSAnISCy 6kg4Q5BdwkVrb3sECsdZV4//wr2AkSAjkSl2eeZ4Mol5L436oEco2EwDIWic7Hd9ggamQkHk2 8yTaBUWgBI8MqRvXi1KKy1CJdI72kosz0jJLcxMwcXUMDM73c1OLixPTUnMSkYr3k/NxNjMAA ZACCHYzL/jodYpTkYFIS5dXubwsX4kvKT6nMSCzOiC8qzUktPsQow8GhJMGbHtYeLiRYlJqeW pGWmQOMBZi0BAePkghveShQmre4IDG3ODMdInWKUZfj2Nwba5mEWPLy81KlxHm/ghQJgBRllO bBjYDF5SVGWSlhXkago4R4ClKLcjNLUOVfMYpzMCoJ8waAXMKTmVcCt+kV0BFMQEdYm4MdUZK IkJJqYIxpnCL9K6+9y2qu0qslqyovPxUseMj6S+B6e/d+IfWJNiV9fBN3r/DYUfhf421Prj0X 2423gq7tgu+m7LqsvdQ+eEuwievkta92aoVusN3uVf/OKk/gseHZGwd7Zey0Gvq3ss78/HZH4 ofLIfMbosrSReuY5jG837ymRnTWn6CjC/Iip+V8e6rEUpyRaKjFXFScCABU3AYjxgIAAA== X-Env-Sender: czuzu@bitdefender.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1468487434!23938668!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 12932 invoked from network); 14 Jul 2016 09:10:35 -0000 Received: from mx01.bbu.dsd.mx.bitdefender.com (HELO mx01.bbu.dsd.mx.bitdefender.com) (91.199.104.161) by server-13.tower-21.messagelabs.com with DHE-RSA-AES128-GCM-SHA256 encrypted SMTP; 14 Jul 2016 09:10:35 -0000 Received: (qmail 24368 invoked from network); 14 Jul 2016 12:10:03 +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:10:03 +0300 Received: from smtp02.buh.bitdefender.net (unknown [10.17.80.76]) by mx-sr.buh.bitdefender.com (Postfix) with ESMTP id 8C1647FC06 for ; Thu, 14 Jul 2016 12:10:03 +0300 (EEST) Received: (qmail 4615 invoked from network); 14 Jul 2016 12:10:03 +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:10:03 +0300 From: Corneliu ZUZU To: xen-devel@lists.xen.org Date: Thu, 14 Jul 2016 12:09:40 +0300 Message-Id: <1468487380-12391-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.000016, 0.004198)], BW: [Enabled, t: (0.000007,0.000001)], RBL DNSBL: [Disabled], APM: [Enabled, Score: 500, t: (0.003487), Flags: 85D2ED72; NN_TP_TAG_HTTP; NN_NO_CONTENT_TYPE; NN_LEGIT_SUMM_400_WORDS; NN_LEGIT_BITDEFENDER; NN_LEGIT_S_SQARE_BRACKETS; NN_LEGIT_MAILING_LIST_TO], SGN: [Enabled, t: (0.011149)], URL: [Enabled, t: (0.000014)], RTDA: [Enabled, t: (0.022482), Hit: No, Details: v2.3.10; Id: 2m1ghhh.1amv7hmgm.132li], total: 0(775) X-BitDefender-CF-Stamp: none Cc: Julien Grall , Stefano Stabellini Subject: [Xen-devel] [PATCH v3 1/8] asm-arm/atomic.h: fix arm32|arm64 macros duplication 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 Move duplicate macros between asm-arm/arm32/atomic.h and asm-arm/arm64/atomic.h to asm-arm/atomic.h. Also empty line fixes. Signed-off-by: Corneliu ZUZU Reviewed-by: Stefano Stabellini --- Changed since v2: * also moved mistakenly omitted atomic_xchg() * arm empty line fixes moved here --- xen/include/asm-arm/arm32/atomic.h | 15 ++------------- xen/include/asm-arm/arm64/atomic.h | 15 ++------------- xen/include/asm-arm/atomic.h | 14 ++++++++++++++ 3 files changed, 18 insertions(+), 26 deletions(-) diff --git a/xen/include/asm-arm/arm32/atomic.h b/xen/include/asm-arm/arm32/atomic.h index 7ec712f..78de60f 100644 --- a/xen/include/asm-arm/arm32/atomic.h +++ b/xen/include/asm-arm/arm32/atomic.h @@ -8,6 +8,7 @@ * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ + #ifndef __ARCH_ARM_ARM32_ATOMIC__ #define __ARCH_ARM_ARM32_ATOMIC__ @@ -147,20 +148,8 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u) return oldval; } -#define atomic_xchg(v, new) (xchg(&((v)->counter), new)) - -#define atomic_inc(v) atomic_add(1, v) -#define atomic_dec(v) atomic_sub(1, v) - -#define atomic_inc_and_test(v) (atomic_add_return(1, v) == 0) -#define atomic_dec_and_test(v) (atomic_sub_return(1, v) == 0) -#define atomic_inc_return(v) (atomic_add_return(1, v)) -#define atomic_dec_return(v) (atomic_sub_return(1, v)) -#define atomic_sub_and_test(i, v) (atomic_sub_return(i, v) == 0) - -#define atomic_add_negative(i,v) (atomic_add_return(i, v) < 0) - #endif /* __ARCH_ARM_ARM32_ATOMIC__ */ + /* * Local variables: * mode: C diff --git a/xen/include/asm-arm/arm64/atomic.h b/xen/include/asm-arm/arm64/atomic.h index b49219e..d640bef 100644 --- a/xen/include/asm-arm/arm64/atomic.h +++ b/xen/include/asm-arm/arm64/atomic.h @@ -19,6 +19,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ + #ifndef __ARCH_ARM_ARM64_ATOMIC #define __ARCH_ARM_ARM64_ATOMIC @@ -113,8 +114,6 @@ static inline int atomic_cmpxchg(atomic_t *ptr, int old, int new) return oldval; } -#define atomic_xchg(v, new) (xchg(&((v)->counter), new)) - static inline int __atomic_add_unless(atomic_t *v, int a, int u) { int c, old; @@ -125,18 +124,8 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u) return c; } -#define atomic_inc(v) atomic_add(1, v) -#define atomic_dec(v) atomic_sub(1, v) - -#define atomic_inc_and_test(v) (atomic_add_return(1, v) == 0) -#define atomic_dec_and_test(v) (atomic_sub_return(1, v) == 0) -#define atomic_inc_return(v) (atomic_add_return(1, v)) -#define atomic_dec_return(v) (atomic_sub_return(1, v)) -#define atomic_sub_and_test(i, v) (atomic_sub_return(i, v) == 0) - -#define atomic_add_negative(i,v) (atomic_add_return(i, v) < 0) - #endif + /* * Local variables: * mode: C diff --git a/xen/include/asm-arm/atomic.h b/xen/include/asm-arm/atomic.h index 29ab265..32771e9 100644 --- a/xen/include/asm-arm/atomic.h +++ b/xen/include/asm-arm/atomic.h @@ -138,7 +138,21 @@ static inline void _atomic_set(atomic_t *v, int i) # error "unknown ARM variant" #endif +#define atomic_inc(v) atomic_add(1, v) +#define atomic_dec(v) atomic_sub(1, v) + +#define atomic_inc_and_test(v) (atomic_add_return(1, v) == 0) +#define atomic_dec_and_test(v) (atomic_sub_return(1, v) == 0) +#define atomic_inc_return(v) (atomic_add_return(1, v)) +#define atomic_dec_return(v) (atomic_sub_return(1, v)) +#define atomic_sub_and_test(i, v) (atomic_sub_return(i, v) == 0) + +#define atomic_add_negative(i,v) (atomic_add_return(i, v) < 0) + +#define atomic_xchg(v, new) (xchg(&((v)->counter), new)) + #endif /* __ARCH_ARM_ATOMIC__ */ + /* * Local variables: * mode: C