From: gang.chen@asianux.com (Chen Gang)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] arm/arm64: remove atomic_clear_mask() in "include/asm/atomic.h"
Date: Sat, 12 Oct 2013 09:46:03 +0800 [thread overview]
Message-ID: <5258A9DB.1070008@asianux.com> (raw)
In-Reply-To: <20131011165530.GS14732@mudshark.cambridge.arm.com>
On 10/12/2013 12:55 AM, Will Deacon wrote:
> On Fri, Oct 11, 2013 at 12:47:05PM +0100, Chen Gang wrote:
>> In current kernel wide source code, except other architectures, only
>> s390 scsi drivers use atomic_clear_mask(), and arm/arm64 need not
>> support s390 drivers.
>>
>> So remove atomic_clear_mask() from "arm[64]/include/asm/atomic.h".
>
> Acked-by: Will Deacon <will.deacon@arm.com>
>
Thank you for your whole work.
> Catalin, are you happy for me to send this via the ARM tree?
>
> Will
>
Thanks.
--
Chen Gang
>>
>> Signed-off-by: Chen Gang <gang.chen@asianux.com>
>> ---
>> arch/arm/include/asm/atomic.h | 24 ------------------------
>> arch/arm64/include/asm/atomic.h | 14 --------------
>> 2 files changed, 0 insertions(+), 38 deletions(-)
>>
>> diff --git a/arch/arm/include/asm/atomic.h b/arch/arm/include/asm/atomic.h
>> index da1c77d..3b3ae49fa 100644
>> --- a/arch/arm/include/asm/atomic.h
>> +++ b/arch/arm/include/asm/atomic.h
>> @@ -134,21 +134,6 @@ static inline int atomic_cmpxchg(atomic_t *ptr, int old, int new)
>> return oldval;
>> }
>>
>> -static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)
>> -{
>> - unsigned long tmp, tmp2;
>> -
>> - __asm__ __volatile__("@ atomic_clear_mask\n"
>> -"1: ldrex %0, [%3]\n"
>> -" bic %0, %0, %4\n"
>> -" strex %1, %0, [%3]\n"
>> -" teq %1, #0\n"
>> -" bne 1b"
>> - : "=&r" (tmp), "=&r" (tmp2), "+Qo" (*addr)
>> - : "r" (addr), "Ir" (mask)
>> - : "cc");
>> -}
>> -
>> #else /* ARM_ARCH_6 */
>>
>> #ifdef CONFIG_SMP
>> @@ -197,15 +182,6 @@ static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
>> return ret;
>> }
>>
>> -static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)
>> -{
>> - unsigned long flags;
>> -
>> - raw_local_irq_save(flags);
>> - *addr &= ~mask;
>> - raw_local_irq_restore(flags);
>> -}
>> -
>> #endif /* __LINUX_ARM_ARCH__ */
>>
>> #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
>> diff --git a/arch/arm64/include/asm/atomic.h b/arch/arm64/include/asm/atomic.h
>> index 8363644..01de5aa 100644
>> --- a/arch/arm64/include/asm/atomic.h
>> +++ b/arch/arm64/include/asm/atomic.h
>> @@ -126,20 +126,6 @@ static inline int atomic_cmpxchg(atomic_t *ptr, int old, int new)
>> return oldval;
>> }
>>
>> -static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)
>> -{
>> - unsigned long tmp, tmp2;
>> -
>> - asm volatile("// atomic_clear_mask\n"
>> -"1: ldxr %0, %2\n"
>> -" bic %0, %0, %3\n"
>> -" stxr %w1, %0, %2\n"
>> -" cbnz %w1, 1b"
>> - : "=&r" (tmp), "=&r" (tmp2), "+Q" (*addr)
>> - : "Ir" (mask)
>> - : "cc");
>> -}
>> -
>> #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
>>
>> static inline int __atomic_add_unless(atomic_t *v, int a, int u)
>> --
>> 1.7.7.6
>>
>
>
--
Chen Gang
next prev parent reply other threads:[~2013-10-12 1:46 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-10 2:30 [PATCH 0/3] s390/arm/arm64: include: asm: atomic.h: use 'unsigned int' and 'atomic_t' instead of 'unsigned long' for atomic_*_mask() Chen Gang
2013-10-10 2:31 ` [PATCH 1/3] s390: include: asm: atomic.h: use 'unsigned int' " Chen Gang
2013-10-10 2:34 ` [PATCH 2/3] arm: include: asm: atomic.h: use 'unsigned int' and 'atomic' instead of 'unsigned long' for atomic_clear_mask() Chen Gang
2013-10-10 2:35 ` [PATCH 3/3] arm64: include: asm: atomic.h: use 'unsigned int' and 'atomic_t' " Chen Gang
2013-10-10 10:07 ` Will Deacon
2013-10-10 11:03 ` Chen Gang
2013-10-10 14:23 ` Will Deacon
2013-10-11 1:18 ` Chen Gang
2013-10-11 10:44 ` Will Deacon
2013-10-11 11:25 ` Chen Gang
2013-10-11 11:47 ` [PATCH] arm/arm64: remove atomic_clear_mask() in "include/asm/atomic.h" Chen Gang
2013-10-11 12:08 ` Richard Weinberger
2013-10-11 12:28 ` Will Deacon
2013-10-11 13:03 ` Richard Weinberger
2013-10-12 1:36 ` Chen Gang
2013-10-12 2:09 ` Chen Gang
2013-10-11 16:55 ` Will Deacon
2013-10-12 1:46 ` Chen Gang [this message]
2013-10-12 22:28 ` Catalin Marinas
2013-11-04 7:36 ` Chen Gang
2013-11-04 10:07 ` Will Deacon
2013-11-04 10:15 ` Chen Gang
2013-10-10 9:58 ` [PATCH 2/3] arm: include: asm: atomic.h: use 'unsigned int' and 'atomic' instead of 'unsigned long' for atomic_clear_mask() Will Deacon
2013-10-10 11:02 ` Chen Gang
2013-10-10 7:25 ` [PATCH 1/3] s390: include: asm: atomic.h: use 'unsigned int' instead of 'unsigned long' for atomic_*_mask() Heiko Carstens
2013-10-10 7:34 ` Chen Gang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5258A9DB.1070008@asianux.com \
--to=gang.chen@asianux.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).