diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2020-07-29 16:14:21 +0200 |
|---|---|---|
| committer | Peter Zijlstra <peterz@infradead.org> | 2020-07-29 16:14:21 +0200 |
| commit | f05d67179def83545d257aaff40b974e5915af38 (patch) | |
| tree | 2154a66bb1dc6ebebfe75c81395bfc3d75a0a7f8 /arch/sparc | |
| parent | Merge tag 'v5.8-rc6' into locking/core, to pick up fixes (diff) | |
| parent | locking/qspinlock: Do not include atomic.h from qspinlock_types.h (diff) | |
| download | linux-f05d67179def83545d257aaff40b974e5915af38.tar.xz linux-f05d67179def83545d257aaff40b974e5915af38.zip | |
Merge branch 'locking/header'
Diffstat (limited to 'arch/sparc')
| -rw-r--r-- | arch/sparc/include/asm/atomic_32.h | 2 | ||||
| -rw-r--r-- | arch/sparc/include/asm/atomic_64.h | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/arch/sparc/include/asm/atomic_32.h b/arch/sparc/include/asm/atomic_32.h index 94c930f0bc62..efad5532f169 100644 --- a/arch/sparc/include/asm/atomic_32.h +++ b/arch/sparc/include/asm/atomic_32.h @@ -18,8 +18,6 @@ #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 *); diff --git a/arch/sparc/include/asm/atomic_64.h b/arch/sparc/include/asm/atomic_64.h index b60448397d4f..6b235d3d1d9d 100644 --- a/arch/sparc/include/asm/atomic_64.h +++ b/arch/sparc/include/asm/atomic_64.h @@ -12,7 +12,6 @@ #include <asm/cmpxchg.h> #include <asm/barrier.h> -#define ATOMIC_INIT(i) { (i) } #define ATOMIC64_INIT(i) { (i) } #define atomic_read(v) READ_ONCE((v)->counter) |