From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752925AbbGOQBU (ORCPT ); Wed, 15 Jul 2015 12:01:20 -0400 Received: from foss.arm.com ([217.140.101.70]:39752 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752007AbbGOQBS (ORCPT ); Wed, 15 Jul 2015 12:01:18 -0400 Date: Wed, 15 Jul 2015 17:01:09 +0100 From: Will Deacon To: Peter Zijlstra Cc: "linux-kernel@vger.kernel.org" , "linux-arch@vger.kernel.org" , "rth@twiddle.net" , "vgupta@synopsys.com" , "linux@arm.linux.org.uk" , "hskinnemoen@gmail.com" , "realmz6@gmail.com" , "dhowells@redhat.com" , "rkuo@codeaurora.org" , "tony.luck@intel.com" , "geert@linux-m68k.org" , "james.hogan@imgtec.com" , "ralf@linux-mips.org" , "jejb@parisc-linux.org" , "benh@kernel.crashing.org" , "heiko.carstens@de.ibm.com" , "davem@davemloft.net" , "cmetcalf@ezchip.com" , "mingo@kernel.org" Subject: Re: [RFC][PATCH 04/24] arm64: Provide atomic_{or,xor,and} Message-ID: <20150715160109.GB17107@arm.com> References: <20150709172855.564686637@infradead.org> <20150709175308.361407648@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20150709175308.361407648@infradead.org> Thread-Topic: [RFC][PATCH 04/24] arm64: Provide atomic_{or,xor,and} Accept-Language: en-GB, en-US Content-Language: en-US User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Jul 09, 2015 at 06:28:59PM +0100, Peter Zijlstra wrote: > Implement atomic logic ops -- atomic_{or,xor,and}. > > These will replace the atomic_{set,clear}_mask functions that are > available on some archs. > > > Signed-off-by: Peter Zijlstra (Intel) > --- > arch/arm64/include/asm/atomic.h | 6 ++++++ > 1 file changed, 6 insertions(+) > > --- a/arch/arm64/include/asm/atomic.h > +++ b/arch/arm64/include/asm/atomic.h > @@ -84,6 +84,9 @@ static inline int atomic_##op##_return(i > > ATOMIC_OPS(add, add) > ATOMIC_OPS(sub, sub) > +ATOMIC_OP(and, and) > +ATOMIC_OP(or, orr) FYI, but without selecting CONFIG_ARCH_HAS_ATOMIC_OR this change leads to build errors: from include/linux/seqlock.h:35, from include/linux/time.h:5, from include/uapi/linux/timex.h:56, from include/linux/timex.h:56, from include/linux/sched.h:19, from arch/arm64/kernel/asm-offsets.c:21: include/linux/atomic.h:115:20: error: redefinition of ‘atomic_or’ static inline void atomic_or(int i, atomic_t *v) ^ In file included from include/linux/atomic.h:4:0, from include/linux/spinlock.h:416, from include/linux/seqlock.h:35, from include/linux/time.h:5, from include/uapi/linux/timex.h:56, from include/linux/timex.h:56, from include/linux/sched.h:19, from arch/arm64/kernel/asm-offsets.c:21: arch/arm64/include/asm/atomic.h:48:20: note: previous definition of ‘atomic_or’ was here static inline void atomic_##op(int i, atomic_t *v) \ ^ arch/arm64/include/asm/atomic.h:88:1: note: in expansion of macro ‘ATOMIC_OP’ ATOMIC_OP(or, orr) ^ make[2]: *** [arch/arm64/kernel/asm-offsets.s] Error 1 Will From mboxrd@z Thu Jan 1 00:00:00 1970 From: Will Deacon Subject: Re: [RFC][PATCH 04/24] arm64: Provide atomic_{or,xor,and} Date: Wed, 15 Jul 2015 17:01:09 +0100 Message-ID: <20150715160109.GB17107@arm.com> References: <20150709172855.564686637@infradead.org> <20150709175308.361407648@infradead.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: Received: from foss.arm.com ([217.140.101.70]:39752 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752007AbbGOQBS (ORCPT ); Wed, 15 Jul 2015 12:01:18 -0400 Content-Disposition: inline In-Reply-To: <20150709175308.361407648@infradead.org> Content-Language: en-US Sender: linux-arch-owner@vger.kernel.org List-ID: To: Peter Zijlstra Cc: "linux-kernel@vger.kernel.org" , "linux-arch@vger.kernel.org" , "rth@twiddle.net" , "vgupta@synopsys.com" , "linux@arm.linux.org.uk" , "hskinnemoen@gmail.com" , "realmz6@gmail.com" , "dhowells@redhat.com" , "rkuo@codeaurora.org" , "tony.luck@intel.com" , "geert@linux-m68k.org" , "james.hogan@imgtec.com" , "ralf@linux-mips.org" , "jejb@parisc-linux.org" , "benh@kernel.crashing.org" , "heiko.carstens@de.ibm.com" , "davem@davemloft.net" , "cmetcalf@ezchip.com" , min On Thu, Jul 09, 2015 at 06:28:59PM +0100, Peter Zijlstra wrote: > Implement atomic logic ops -- atomic_{or,xor,and}. >=20 > These will replace the atomic_{set,clear}_mask functions that are > available on some archs. >=20 >=20 > Signed-off-by: Peter Zijlstra (Intel) > --- > arch/arm64/include/asm/atomic.h | 6 ++++++ > 1 file changed, 6 insertions(+) >=20 > --- a/arch/arm64/include/asm/atomic.h > +++ b/arch/arm64/include/asm/atomic.h > @@ -84,6 +84,9 @@ static inline int atomic_##op##_return(i > =20 > ATOMIC_OPS(add, add) > ATOMIC_OPS(sub, sub) > +ATOMIC_OP(and, and) > +ATOMIC_OP(or, orr) =46YI, but without selecting CONFIG_ARCH_HAS_ATOMIC_OR this change lead= s to build errors: from include/linux/seqlock.h:35, from include/linux/time.h:5, from include/uapi/linux/timex.h:56, from include/linux/timex.h:56, from include/linux/sched.h:19, from arch/arm64/kernel/asm-offsets.c:21: include/linux/atomic.h:115:20: error: redefinition of =E2=80=98atomic_o= r=E2=80=99 static inline void atomic_or(int i, atomic_t *v) ^ In file included from include/linux/atomic.h:4:0, from include/linux/spinlock.h:416, from include/linux/seqlock.h:35, from include/linux/time.h:5, from include/uapi/linux/timex.h:56, from include/linux/timex.h:56, from include/linux/sched.h:19, from arch/arm64/kernel/asm-offsets.c:21: arch/arm64/include/asm/atomic.h:48:20: note: previous definition of =E2= =80=98atomic_or=E2=80=99 was here static inline void atomic_##op(int i, atomic_t *v) \ ^ arch/arm64/include/asm/atomic.h:88:1: note: in expansion of macro =E2=80= =98ATOMIC_OP=E2=80=99 ATOMIC_OP(or, orr) ^ make[2]: *** [arch/arm64/kernel/asm-offsets.s] Error 1 Will