Commit bef82820 authored by Mark Rutland's avatar Mark Rutland Committed by Ingo Molnar
Browse files

atomics/treewide: Make atomic64_inc_not_zero() optional 



We define a trivial fallback for atomic_inc_not_zero(), but don't do
the same for atomic64_inc_not_zero(), leading most architectures to
define the same boilerplate.

Let's add a fallback in <linux/atomic.h>, and remove the redundant
implementations. Note that atomic64_add_unless() is always defined in
<linux/atomic.h>, and promotes its arguments to the requisite types, so
we need not do this explicitly.

There should be no functional change as a result of this patch.

Signed-off-by: default avatarMark Rutland <mark.rutland@arm.com>
Reviewed-by: default avatarWill Deacon <will.deacon@arm.com>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: default avatarPalmer Dabbelt <palmer@sifive.com>
Cc: Boqun Feng <boqun.feng@gmail.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/lkml/20180621121321.4761-6-mark.rutland@arm.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent ade5ef92

arch/alpha/include/asm/atomic.h

+0 −2
Original line number Diff line number Diff line
@@ -296,8 +296,6 @@ static inline long atomic64_dec_if_positive(atomic64_t *v) 
	return old - 1;

}



#define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)



#define atomic_add_negative(a, v) (atomic_add_return((a), (v)) < 0)

#define atomic64_add_negative(a, v) (atomic64_add_return((a), (v)) < 0)

arch/arc/include/asm/atomic.h

+0 −1
Original line number Diff line number Diff line
@@ -603,7 +603,6 @@ static inline int atomic64_add_unless(atomic64_t *v, long long a, long long u) 
#define atomic64_dec(v)			atomic64_sub(1LL, (v))

#define atomic64_dec_return(v)		atomic64_sub_return(1LL, (v))

#define atomic64_dec_and_test(v)	(atomic64_dec_return((v)) == 0)

#define atomic64_inc_not_zero(v)	atomic64_add_unless((v), 1LL, 0LL)



#endif	/* !CONFIG_GENERIC_ATOMIC64 */

arch/arm/include/asm/atomic.h

+0 −1
Original line number Diff line number Diff line
@@ -534,7 +534,6 @@ static inline int atomic64_add_unless(atomic64_t *v, long long a, long long u) 
#define atomic64_dec(v)			atomic64_sub(1LL, (v))

#define atomic64_dec_return_relaxed(v)	atomic64_sub_return_relaxed(1LL, (v))

#define atomic64_dec_and_test(v)	(atomic64_dec_return((v)) == 0)

#define atomic64_inc_not_zero(v)	atomic64_add_unless((v), 1LL, 0LL)



#endif /* !CONFIG_GENERIC_ATOMIC64 */

#endif

arch/arm64/include/asm/atomic.h

+0 −2
Original line number Diff line number Diff line
@@ -204,7 +204,5 @@ 
#define atomic64_add_unless(v, a, u)	(___atomic_add_unless(v, a, u, 64) != u)

#define atomic64_andnot			atomic64_andnot



#define atomic64_inc_not_zero(v)	atomic64_add_unless((v), 1, 0)



#endif

#endif

arch/ia64/include/asm/atomic.h

+0 −2
Original line number Diff line number Diff line
@@ -246,8 +246,6 @@ static __inline__ long atomic64_add_unless(atomic64_t *v, long a, long u) 
	return c != (u);

}



#define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)



static __inline__ long atomic64_dec_if_positive(atomic64_t *v)

{

	long c, old, dec;

CRA Git | Maintained and supported by SUSTech CRA and CCSE