summaryrefslogtreecommitdiffstats
path: root/arch/ia64
diff options
context:
space:
mode:
authorPeter Zijlstra <peterz@infradead.org>2020-07-29 16:14:21 +0200
committerPeter Zijlstra <peterz@infradead.org>2020-07-29 16:14:21 +0200
commitf05d67179def83545d257aaff40b974e5915af38 (patch)
tree2154a66bb1dc6ebebfe75c81395bfc3d75a0a7f8 /arch/ia64
parentc84d53051fcb4f3d14d5a245e1d7ee8512bcb199 (diff)
parent459e39538e612b8dd130d34b93c9bfc89ecc836c (diff)
downloadlinux-f05d67179def83545d257aaff40b974e5915af38.tar.gz
linux-f05d67179def83545d257aaff40b974e5915af38.tar.xz
Merge branch 'locking/header'
Diffstat (limited to 'arch/ia64')
-rw-r--r--arch/ia64/include/asm/atomic.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/ia64/include/asm/atomic.h b/arch/ia64/include/asm/atomic.h
index 50440f3ddc43..f267d956458f 100644
--- a/arch/ia64/include/asm/atomic.h
+++ b/arch/ia64/include/asm/atomic.h
@@ -19,7 +19,6 @@
#include <asm/barrier.h>
-#define ATOMIC_INIT(i) { (i) }
#define ATOMIC64_INIT(i) { (i) }
#define atomic_read(v) READ_ONCE((v)->counter)