summaryrefslogtreecommitdiffstats
path: root/include/asm-generic/atomic-instrumented.h
diff options
context:
space:
mode:
authorMark Rutland2018-06-21 14:13:17 +0200
committerIngo Molnar2018-06-21 14:25:24 +0200
commit356701329fb391184618eda7b7fb68cb35271506 (patch)
tree4d9dc75f1a20215b12ec4f5c40870de290264484 /include/asm-generic/atomic-instrumented.h
parentatomics/riscv: Define atomic64_fetch_add_unless() (diff)
downloadkernel-qcow2-linux-356701329fb391184618eda7b7fb68cb35271506.tar.gz
kernel-qcow2-linux-356701329fb391184618eda7b7fb68cb35271506.tar.xz
kernel-qcow2-linux-356701329fb391184618eda7b7fb68cb35271506.zip
atomics/treewide: Make atomic64_fetch_add_unless() optional
Architectures with atomic64_fetch_add_unless() provide a preprocessor symbol if they do so, and all other architectures have trivial C implementations of atomic64_add_unless() which are near-identical. Let's unify the trivial definitions of atomic64_fetch_add_unless() in <linux/atomic.h>, so that we always have both atomic64_fetch_add_unless() and atomic64_add_unless() with less boilerplate code. This means that atomic64_add_unless() is always implemented in core code, and the instrumented atomics are updated accordingly. 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> 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-15-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.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/include/asm-generic/atomic-instrumented.h b/include/asm-generic/atomic-instrumented.h
index 444bf2f9d54d..2b487f28ef35 100644
--- a/include/asm-generic/atomic-instrumented.h
+++ b/include/asm-generic/atomic-instrumented.h
@@ -100,12 +100,6 @@ static __always_inline s64 atomic64_fetch_add_unless(atomic64_t *v, s64 a, s64 u
kasan_check_write(v, sizeof(*v));
return arch_atomic64_fetch_add_unless(v, a, u);
}
-#else
-static __always_inline bool atomic64_add_unless(atomic64_t *v, s64 a, s64 u)
-{
- kasan_check_write(v, sizeof(*v));
- return arch_atomic64_add_unless(v, a, u);
-}
#endif
static __always_inline void atomic_inc(atomic_t *v)