diff options
| author | Mark Rutland <mark.rutland@arm.com> | 2018-06-21 08:13:18 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-06-21 08:25:24 -0400 |
| commit | 18cc1814d4e7560412c9c8c6d28f9d6782c8b402 (patch) | |
| tree | 7295996dcedd3f3d90da1e570a1b459499a0d54a /arch/alpha/include | |
| parent | 356701329fb391184618eda7b7fb68cb35271506 (diff) | |
atomics/treewide: Make test ops optional
Some of the atomics return the result of a test applied after the atomic
operation, and almost all architectures implement these as trivial
wrappers around the underlying atomic. Specifically:
* <atomic>_inc_and_test(v) is (<atomic>_inc_return(v) == 0)
* <atomic>_dec_and_test(v) is (<atomic>_dec_return(v) == 0)
* <atomic>_sub_and_test(i, v) is (<atomic>_sub_return(i, v) == 0)
* <atomic>_add_negative(i, v) is (<atomic>_add_return(i, v) < 0)
Rather than have these definitions duplicated in all architectures, with
minor inconsistencies in formatting and documentation, let's make these
operations optional, with default fallbacks as above. Implementations
must now provide a preprocessor symbol.
The instrumented atomics are updated accordingly.
Both x86 and m68k have custom implementations, which are left as-is,
given preprocessor symbols to avoid being overridden.
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: Geert Uytterhoeven <geert@linux-m68k.org>
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-16-mark.rutland@arm.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/alpha/include')
| -rw-r--r-- | arch/alpha/include/asm/atomic.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/alpha/include/asm/atomic.h b/arch/alpha/include/asm/atomic.h index cc486dbb3837..25f8693c5a42 100644 --- a/arch/alpha/include/asm/atomic.h +++ b/arch/alpha/include/asm/atomic.h | |||
| @@ -297,24 +297,12 @@ static inline long atomic64_dec_if_positive(atomic64_t *v) | |||
| 297 | return old - 1; | 297 | return old - 1; |
| 298 | } | 298 | } |
| 299 | 299 | ||
| 300 | #define atomic_add_negative(a, v) (atomic_add_return((a), (v)) < 0) | ||
| 301 | #define atomic64_add_negative(a, v) (atomic64_add_return((a), (v)) < 0) | ||
| 302 | |||
| 303 | #define atomic_dec_return(v) atomic_sub_return(1,(v)) | 300 | #define atomic_dec_return(v) atomic_sub_return(1,(v)) |
| 304 | #define atomic64_dec_return(v) atomic64_sub_return(1,(v)) | 301 | #define atomic64_dec_return(v) atomic64_sub_return(1,(v)) |
| 305 | 302 | ||
| 306 | #define atomic_inc_return(v) atomic_add_return(1,(v)) | 303 | #define atomic_inc_return(v) atomic_add_return(1,(v)) |
| 307 | #define atomic64_inc_return(v) atomic64_add_return(1,(v)) | 304 | #define atomic64_inc_return(v) atomic64_add_return(1,(v)) |
| 308 | 305 | ||
| 309 | #define atomic_sub_and_test(i,v) (atomic_sub_return((i), (v)) == 0) | ||
| 310 | #define atomic64_sub_and_test(i,v) (atomic64_sub_return((i), (v)) == 0) | ||
| 311 | |||
| 312 | #define atomic_inc_and_test(v) (atomic_add_return(1, (v)) == 0) | ||
| 313 | #define atomic64_inc_and_test(v) (atomic64_add_return(1, (v)) == 0) | ||
| 314 | |||
| 315 | #define atomic_dec_and_test(v) (atomic_sub_return(1, (v)) == 0) | ||
| 316 | #define atomic64_dec_and_test(v) (atomic64_sub_return(1, (v)) == 0) | ||
| 317 | |||
| 318 | #define atomic_inc(v) atomic_add(1,(v)) | 306 | #define atomic_inc(v) atomic_add(1,(v)) |
| 319 | #define atomic64_inc(v) atomic64_add(1,(v)) | 307 | #define atomic64_inc(v) atomic64_add(1,(v)) |
| 320 | 308 | ||
