Received: by 2002:a25:86ce:0:0:0:0:0 with SMTP id y14csp472690ybm; Wed, 22 May 2019 06:27:40 -0700 (PDT) X-Google-Smtp-Source: APXvYqxSmAeXI/tMIrxV7RNtmK82vreB0SYh53kMq0/I4WE7+LQtGgk+7TdMbQM6yzBd7DeyoMq2 X-Received: by 2002:a62:3605:: with SMTP id d5mr75217086pfa.28.1558531660557; Wed, 22 May 2019 06:27:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558531660; cv=none; d=google.com; s=arc-20160816; b=cbrK26PtITacs453KKWMJ1x8nRdtuNRVRntT83aQLRYznapcaj+20Iq7WafN5WO/cP QxxbV2CWtCm3P7nmOqd8Z+N7/ZQgVo3LqSMqMmqj8qwfsZPjVBwvjE+TX8ujtAv25rf0 kkRSZna+WeFAtnnzkckg/BhkmzMPZO3vRs55d7SI/QjUESvzq0Vl92eoxd1iN7+wieLl 4zSeHwSm3XpwHfEqcH5qlR8LgT5qWc5VyPd74W9EZrSReYpA209w7/tntkP7/CrZHzDm gx2gST7jg5/NRSNA5UphvMkr/2bb+wj+D8IDJc3CXQRw3vpAHBDHuw9Wb8hkup1Ek9Cm Qc9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from; bh=8jGhecHXi8esBoyZgI3ujmIDhtN4iwcR41K3iJO1Tw4=; b=m9r3e2OT3ybzLUu6V905ruQMRescrU9zJNwATkip7q4bvHJ3iuY6wz5fTs6+bXoIas sRHIzw3ez9fz5trrRusTHwz2k5nJIix7I4tqWVmAgP5O+F7/JXFLNFZzMFds02mnA/jF ZVIwNAIyJ8CxUsepxaVxphVrbV5Itl9VwSqvp9ag/BA3Qym05ustwgh6FIzkDgqa5dKk ayj0wBv/rirUW7I5VmyIQRkq0HqaeFXaOcnZoN0xLlQMiUPaNjf+hPNknR+o89C4DynV WfBpucU8Fcyh8HBbEFrTI7/FXuKRM7nxRnukV7FDJdE+Um14NC6YNsFX5Fo+qB37+yx2 YkCw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q2si25523044plh.148.2019.05.22.06.27.25; Wed, 22 May 2019 06:27:40 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729619AbfEVNYo (ORCPT + 99 others); Wed, 22 May 2019 09:24:44 -0400 Received: from foss.arm.com ([217.140.101.70]:50872 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729059AbfEVNYn (ORCPT ); Wed, 22 May 2019 09:24:43 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id BDE5880D; Wed, 22 May 2019 06:24:42 -0700 (PDT) Received: from lakrids.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.72.51.249]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 7C2A83F575; Wed, 22 May 2019 06:24:38 -0700 (PDT) From: Mark Rutland To: linux-kernel@vger.kernel.org, peterz@infradead.org, will.deacon@arm.com Cc: aou@eecs.berkeley.edu, arnd@arndb.de, bp@alien8.de, catalin.marinas@arm.com, davem@davemloft.net, fenghua.yu@intel.com, heiko.carstens@de.ibm.com, herbert@gondor.apana.org.au, ink@jurassic.park.msu.ru, jhogan@kernel.org, linux@armlinux.org.uk, mark.rutland@arm.com, mattst88@gmail.com, mingo@kernel.org, mpe@ellerman.id.au, palmer@sifive.com, paul.burton@mips.com, paulus@samba.org, ralf@linux-mips.org, rth@twiddle.net, stable@vger.kernel.org, tglx@linutronix.de, tony.luck@intel.com, vgupta@synopsys.com Subject: [PATCH 08/18] locking/atomic: ia64: use s64 for atomic64 Date: Wed, 22 May 2019 14:22:40 +0100 Message-Id: <20190522132250.26499-9-mark.rutland@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190522132250.26499-1-mark.rutland@arm.com> References: <20190522132250.26499-1-mark.rutland@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org As a step towards making the atomic64 API use consistent types treewide, let's have the ia64 atomic64 implementation use s64 as the underlying type for atomic64_t, rather than long or __s64, matching the generated headers. As atomic64_read() depends on the generic defintion of atomic64_t, this still returns long. This will be converted in a subsequent patch. Otherwise, there should be no functional change as a result of this patch. Signed-off-by: Mark Rutland Cc: Fenghua Yu Cc: Peter Zijlstra Cc: Tony Luck Cc: Will Deacon --- arch/ia64/include/asm/atomic.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/ia64/include/asm/atomic.h b/arch/ia64/include/asm/atomic.h index 206530d0751b..50440f3ddc43 100644 --- a/arch/ia64/include/asm/atomic.h +++ b/arch/ia64/include/asm/atomic.h @@ -124,10 +124,10 @@ ATOMIC_FETCH_OP(xor, ^) #undef ATOMIC_OP #define ATOMIC64_OP(op, c_op) \ -static __inline__ long \ -ia64_atomic64_##op (__s64 i, atomic64_t *v) \ +static __inline__ s64 \ +ia64_atomic64_##op (s64 i, atomic64_t *v) \ { \ - __s64 old, new; \ + s64 old, new; \ CMPXCHG_BUGCHECK_DECL \ \ do { \ @@ -139,10 +139,10 @@ ia64_atomic64_##op (__s64 i, atomic64_t *v) \ } #define ATOMIC64_FETCH_OP(op, c_op) \ -static __inline__ long \ -ia64_atomic64_fetch_##op (__s64 i, atomic64_t *v) \ +static __inline__ s64 \ +ia64_atomic64_fetch_##op (s64 i, atomic64_t *v) \ { \ - __s64 old, new; \ + s64 old, new; \ CMPXCHG_BUGCHECK_DECL \ \ do { \ @@ -162,7 +162,7 @@ ATOMIC64_OPS(sub, -) #define atomic64_add_return(i,v) \ ({ \ - long __ia64_aar_i = (i); \ + s64 __ia64_aar_i = (i); \ __ia64_atomic_const(i) \ ? ia64_fetch_and_add(__ia64_aar_i, &(v)->counter) \ : ia64_atomic64_add(__ia64_aar_i, v); \ @@ -170,7 +170,7 @@ ATOMIC64_OPS(sub, -) #define atomic64_sub_return(i,v) \ ({ \ - long __ia64_asr_i = (i); \ + s64 __ia64_asr_i = (i); \ __ia64_atomic_const(i) \ ? ia64_fetch_and_add(-__ia64_asr_i, &(v)->counter) \ : ia64_atomic64_sub(__ia64_asr_i, v); \ @@ -178,7 +178,7 @@ ATOMIC64_OPS(sub, -) #define atomic64_fetch_add(i,v) \ ({ \ - long __ia64_aar_i = (i); \ + s64 __ia64_aar_i = (i); \ __ia64_atomic_const(i) \ ? ia64_fetchadd(__ia64_aar_i, &(v)->counter, acq) \ : ia64_atomic64_fetch_add(__ia64_aar_i, v); \ @@ -186,7 +186,7 @@ ATOMIC64_OPS(sub, -) #define atomic64_fetch_sub(i,v) \ ({ \ - long __ia64_asr_i = (i); \ + s64 __ia64_asr_i = (i); \ __ia64_atomic_const(i) \ ? ia64_fetchadd(-__ia64_asr_i, &(v)->counter, acq) \ : ia64_atomic64_fetch_sub(__ia64_asr_i, v); \ -- 2.11.0