From patchwork Wed Jul 13 14:18: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: 9227697 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 56D9E60572 for ; Wed, 13 Jul 2016 14:21:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 450C326E69 for ; Wed, 13 Jul 2016 14:21:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 382EB271FD; Wed, 13 Jul 2016 14:21:52 +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 0D35B26E69 for ; Wed, 13 Jul 2016 14:21:51 +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 1bNL0f-000149-4T; Wed, 13 Jul 2016 14:19:33 +0000 Received: from mail6.bemta6.messagelabs.com ([85.158.143.247]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bNL0d-000140-OY for xen-devel@lists.xen.org; Wed, 13 Jul 2016 14:19:31 +0000 Received: from [85.158.143.35] by server-3.bemta-6.messagelabs.com id 2B/97-22092-3FD46875; Wed, 13 Jul 2016 14:19:31 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrBIsWRWlGSWpSXmKPExsUSfTxjoe4n37Z wg2m/FC2WfFzM4sDocXT3b6YAxijWzLyk/IoE1oxjSw8wFWwRq5iwfi9TA+MN4S5GTg4hAQ+J re0rmLoYuYDstYwS85vOsEE4Jxklri84AORwgFX1vgiAK2qeupoRpJtNQFvi3KF7TCC2iIC0x LXPl8HizAKhElP/PmABsYUFfCQmNW0Gs1kEVCUuX9zADmLzCrhIPFuxmRFkvoSAnMSCC+kgYU 4BV4lZV2ewQBznItG5+z7YSAmBHIlTiy6zQZRLSfxvVYIId7NIHDpoBGHLSDyaeJNtAqPQAka GVYzqxalFZalFuoZ6SUWZ6RkluYmZObqGBmZ6uanFxYnpqTmJScV6yfm5mxiBIcgABDsYdz53 OsQoycGkJMrbObc1XIgvKT+lMiOxOCO+qDQntfgQowwHh5IEb5ZPW7iQYFFqempFWmYOMBpg0 hIcPEoivJXeQGne4oLE3OLMdIjUKUZFKXHelSB9AiCJjNI8uDZYBF5ilJUS5mUEOkSIpyC1KD ezBFX+FaM4B6OSMG8RyBSezLwSuOmvgBYzAS2udWgGWVySiJCSamDU03K4yMrH2ZB22erQ08X Zi8od/adlej5iOfxG7pNg+AGXNb0zvh7v5py08smNzMtiZ+Zf2KfScVv+slR6RsBB1UOrNOvN WPYtD7945tX304+uaC65uHwvu4qA85R9c0wDviVeYrdyLfZW2Gzw08s4M9h4vs7l7Ke8l8OW3 8isYvjMJymwb+V/JZbijERDLeai4kQA0XPgZbsCAAA= X-Env-Sender: czuzu@bitdefender.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1468419569!17620100!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 65236 invoked from network); 13 Jul 2016 14:19:30 -0000 Received: from mx01.bbu.dsd.mx.bitdefender.com (HELO mx01.bbu.dsd.mx.bitdefender.com) (91.199.104.161) by server-4.tower-21.messagelabs.com with DHE-RSA-AES128-GCM-SHA256 encrypted SMTP; 13 Jul 2016 14:19:30 -0000 Received: (qmail 13503 invoked from network); 13 Jul 2016 17:18:58 +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:18:58 +0300 Received: from smtp03.buh.bitdefender.org (unknown [10.17.80.77]) by mx-sr.buh.bitdefender.com (Postfix) with ESMTP id 2D3D47FC06 for ; Wed, 13 Jul 2016 17:18:58 +0300 (EEST) Received: (qmail 21589 invoked from network); 13 Jul 2016 17:18:58 +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:18:58 +0300 From: Corneliu ZUZU To: xen-devel@lists.xen.org Date: Wed, 13 Jul 2016 17:18:25 +0300 Message-Id: <1468419505-2692-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.000008, 0.003488)], BW: [Enabled, t: (0.000006,0.000002)], RBL DNSBL: [Disabled], APM: [Enabled, Score: 500, t: (0.003110), 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.010173)], URL: [Enabled, t: (0.000005)], RTDA: [Enabled, t: (0.015110), Hit: No, Details: v2.3.10; Id: 2m1ghm1.1an9ci7f8.f05j], total: 0(775) X-BitDefender-CF-Stamp: none Cc: Julien Grall , Stefano Stabellini Subject: [Xen-devel] [PATCH v2 1/5] 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. Signed-off-by: Corneliu ZUZU Reviewed-by: Stefano Stabellini --- xen/include/asm-arm/arm32/atomic.h | 11 ----------- xen/include/asm-arm/arm64/atomic.h | 11 ----------- xen/include/asm-arm/atomic.h | 11 +++++++++++ 3 files changed, 11 insertions(+), 22 deletions(-) diff --git a/xen/include/asm-arm/arm32/atomic.h b/xen/include/asm-arm/arm32/atomic.h index 7ec712f..be08ff1 100644 --- a/xen/include/asm-arm/arm32/atomic.h +++ b/xen/include/asm-arm/arm32/atomic.h @@ -149,17 +149,6 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u) #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: diff --git a/xen/include/asm-arm/arm64/atomic.h b/xen/include/asm-arm/arm64/atomic.h index b49219e..80d07bf 100644 --- a/xen/include/asm-arm/arm64/atomic.h +++ b/xen/include/asm-arm/arm64/atomic.h @@ -125,17 +125,6 @@ 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: diff --git a/xen/include/asm-arm/atomic.h b/xen/include/asm-arm/atomic.h index 29ab265..41d1b6c 100644 --- a/xen/include/asm-arm/atomic.h +++ b/xen/include/asm-arm/atomic.h @@ -138,6 +138,17 @@ 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) + #endif /* __ARCH_ARM_ATOMIC__ */ /* * Local variables: