bfc18e389c
While __atomic_add_unless() was originally intended as a building-block
for atomic_add_unless(), it's now used in a number of places around the
kernel. It's the only common atomic operation named __atomic*(), rather
than atomic_*(), and for consistency it would be better named
atomic_fetch_add_unless().
This lack of consistency is slightly confusing, and gets in the way of
scripting atomics. Given that, let's clean things up and promote it to
an official part of the atomics API, in the form of
atomic_fetch_add_unless().
This patch converts definitions and invocations over to the new name,
including the instrumented version, using the following script:
----
git grep -w __atomic_add_unless | while read line; do
sed -i '{s/\<__atomic_add_unless\>/atomic_fetch_add_unless/}' "${line%%:*}";
done
git grep -w __arch_atomic_add_unless | while read line; do
sed -i '{s/\<__arch_atomic_add_unless\>/arch_atomic_fetch_add_unless/}' "${line%%:*}";
done
----
Note that we do not have atomic{64,_long}_fetch_add_unless(), which will
be introduced by later patches.
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-2-mark.rutland@arm.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
68 lines
2.3 KiB
C
68 lines
2.3 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
/* atomic.h: These still suck, but the I-cache hit rate is higher.
|
|
*
|
|
* Copyright (C) 1996 David S. Miller (davem@davemloft.net)
|
|
* Copyright (C) 2000 Anton Blanchard (anton@linuxcare.com.au)
|
|
* Copyright (C) 2007 Kyle McMartin (kyle@parisc-linux.org)
|
|
*
|
|
* Additions by Keith M Wesolowski (wesolows@foobazco.org) based
|
|
* on asm-parisc/atomic.h Copyright (C) 2000 Philipp Rumpf <prumpf@tux.org>.
|
|
*/
|
|
|
|
#ifndef __ARCH_SPARC_ATOMIC__
|
|
#define __ARCH_SPARC_ATOMIC__
|
|
|
|
#include <linux/types.h>
|
|
|
|
#include <asm/cmpxchg.h>
|
|
#include <asm/barrier.h>
|
|
#include <asm-generic/atomic64.h>
|
|
|
|
#define ATOMIC_INIT(i) { (i) }
|
|
|
|
int atomic_add_return(int, atomic_t *);
|
|
int atomic_fetch_add(int, atomic_t *);
|
|
int atomic_fetch_and(int, atomic_t *);
|
|
int atomic_fetch_or(int, atomic_t *);
|
|
int atomic_fetch_xor(int, atomic_t *);
|
|
int atomic_cmpxchg(atomic_t *, int, int);
|
|
int atomic_xchg(atomic_t *, int);
|
|
int atomic_fetch_add_unless(atomic_t *, int, int);
|
|
void atomic_set(atomic_t *, int);
|
|
|
|
#define atomic_set_release(v, i) atomic_set((v), (i))
|
|
|
|
#define atomic_read(v) READ_ONCE((v)->counter)
|
|
|
|
#define atomic_add(i, v) ((void)atomic_add_return( (int)(i), (v)))
|
|
#define atomic_sub(i, v) ((void)atomic_add_return(-(int)(i), (v)))
|
|
#define atomic_inc(v) ((void)atomic_add_return( 1, (v)))
|
|
#define atomic_dec(v) ((void)atomic_add_return( -1, (v)))
|
|
|
|
#define atomic_and(i, v) ((void)atomic_fetch_and((i), (v)))
|
|
#define atomic_or(i, v) ((void)atomic_fetch_or((i), (v)))
|
|
#define atomic_xor(i, v) ((void)atomic_fetch_xor((i), (v)))
|
|
|
|
#define atomic_sub_return(i, v) (atomic_add_return(-(int)(i), (v)))
|
|
#define atomic_fetch_sub(i, v) (atomic_fetch_add (-(int)(i), (v)))
|
|
|
|
#define atomic_inc_return(v) (atomic_add_return( 1, (v)))
|
|
#define atomic_dec_return(v) (atomic_add_return( -1, (v)))
|
|
|
|
#define atomic_add_negative(a, v) (atomic_add_return((a), (v)) < 0)
|
|
|
|
/*
|
|
* atomic_inc_and_test - increment and test
|
|
* @v: pointer of type atomic_t
|
|
*
|
|
* Atomically increments @v by 1
|
|
* and returns true if the result is zero, or false for all
|
|
* other cases.
|
|
*/
|
|
#define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
|
|
|
|
#define atomic_dec_and_test(v) (atomic_dec_return(v) == 0)
|
|
#define atomic_sub_and_test(i, v) (atomic_sub_return(i, v) == 0)
|
|
|
|
#endif /* !(__ARCH_SPARC_ATOMIC__) */
|