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/s390 | |
parent | c84d53051fcb4f3d14d5a245e1d7ee8512bcb199 (diff) | |
parent | 459e39538e612b8dd130d34b93c9bfc89ecc836c (diff) | |
download | linux-f05d67179def83545d257aaff40b974e5915af38.tar.gz linux-f05d67179def83545d257aaff40b974e5915af38.tar.bz2 linux-f05d67179def83545d257aaff40b974e5915af38.zip |
Merge branch 'locking/header'
Diffstat (limited to 'arch/s390')
-rw-r--r-- | arch/s390/include/asm/atomic.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/s390/include/asm/atomic.h b/arch/s390/include/asm/atomic.h index 491ad53a0d4e..cae473a7b6f7 100644 --- a/arch/s390/include/asm/atomic.h +++ b/arch/s390/include/asm/atomic.h @@ -15,8 +15,6 @@ #include <asm/barrier.h> #include <asm/cmpxchg.h> -#define ATOMIC_INIT(i) { (i) } - static inline int atomic_read(const atomic_t *v) { int c; |