diff options
| author | Mark Rutland | 2018-06-21 14:13:08 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2018-06-21 14:22:33 +0200 |
| commit | bef828204a1bc7a0fd3a24551c4265e9c2ab95ed (patch) | |
| tree | bb35ac3bc791547c1345aaa737406f9b315a9e63 /include/asm-generic/atomic-instrumented.h | |
| parent | atomics: Make conditional ops return 'bool' (diff) | |
| download | kernel-qcow2-linux-bef828204a1bc7a0fd3a24551c4265e9c2ab95ed.tar.gz kernel-qcow2-linux-bef828204a1bc7a0fd3a24551c4265e9c2ab95ed.tar.xz kernel-qcow2-linux-bef828204a1bc7a0fd3a24551c4265e9c2ab95ed.zip | |
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: Mark Rutland <mark.rutland@arm.com>
Reviewed-by: Will Deacon <will.deacon@arm.com>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Palmer 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: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/asm-generic/atomic-instrumented.h')
| -rw-r--r-- | include/asm-generic/atomic-instrumented.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/asm-generic/atomic-instrumented.h b/include/asm-generic/atomic-instrumented.h index 497faa4a05e3..83bb88d791c4 100644 --- a/include/asm-generic/atomic-instrumented.h +++ b/include/asm-generic/atomic-instrumented.h @@ -205,11 +205,14 @@ static __always_inline s64 atomic64_dec_return(atomic64_t *v) return arch_atomic64_dec_return(v); } +#ifdef arch_atomic64_inc_not_zero +#define atomic64_inc_not_zero atomic64_inc_not_zero static __always_inline bool atomic64_inc_not_zero(atomic64_t *v) { kasan_check_write(v, sizeof(*v)); return arch_atomic64_inc_not_zero(v); } +#endif static __always_inline s64 atomic64_dec_if_positive(atomic64_t *v) { |