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/m68k | |
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/m68k')
-rw-r--r-- | arch/m68k/include/asm/atomic.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/m68k/include/asm/atomic.h b/arch/m68k/include/asm/atomic.h index 47228b0d4163..756c5cc58f94 100644 --- a/arch/m68k/include/asm/atomic.h +++ b/arch/m68k/include/asm/atomic.h @@ -16,8 +16,6 @@ * We do not have SMP m68k systems, so we don't have to deal with that. */ -#define ATOMIC_INIT(i) { (i) } - #define atomic_read(v) READ_ONCE((v)->counter) #define atomic_set(v, i) WRITE_ONCE(((v)->counter), (i)) |