aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Zijlstra <peterz@infradead.org>2014-04-23 13:32:50 -0400
committerThomas Gleixner <tglx@linutronix.de>2015-07-27 08:06:24 -0400
commite6942b7de2dfe44ebde9bae57dadece5abca9de8 (patch)
treeb235317c5f6d200bcc25b43a406237a0d15319cf
parent2957c035395e492463d7f589af9dd32388967bbb (diff)
atomic: Provide atomic_{or,xor,and}
Implement atomic logic ops -- atomic_{or,xor,and}. These will replace the atomic_{set,clear}_mask functions that are available on some archs. Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat
-rw-r--r--arch/alpha/include/asm/atomic.h1
-rw-r--r--arch/arc/include/asm/atomic.h1
-rw-r--r--arch/arm/include/asm/atomic.h1
-rw-r--r--arch/arm64/include/asm/atomic.h1
-rw-r--r--arch/avr32/include/asm/atomic.h2
-rw-r--r--arch/blackfin/include/asm/atomic.h2
-rw-r--r--arch/frv/include/asm/atomic.h2
-rw-r--r--arch/h8300/include/asm/atomic.h2
-rw-r--r--arch/hexagon/include/asm/atomic.h2
-rw-r--r--arch/ia64/include/asm/atomic.h2
-rw-r--r--arch/m32r/include/asm/atomic.h2
-rw-r--r--arch/m68k/include/asm/atomic.h2
-rw-r--r--arch/metag/include/asm/atomic_lnkget.h2
-rw-r--r--arch/mips/include/asm/atomic.h2
-rw-r--r--arch/mn10300/include/asm/atomic.h2
-rw-r--r--arch/parisc/include/asm/atomic.h2
-rw-r--r--arch/powerpc/include/asm/atomic.h2
-rw-r--r--arch/s390/include/asm/atomic.h2
-rw-r--r--arch/sh/include/asm/atomic-grb.h2
-rw-r--r--arch/sparc/include/asm/atomic_32.h2
-rw-r--r--arch/sparc/include/asm/atomic_64.h2
-rw-r--r--arch/tile/include/asm/atomic_32.h2
-rw-r--r--arch/tile/include/asm/atomic_64.h2
-rw-r--r--arch/x86/include/asm/atomic.h2
-rw-r--r--arch/xtensa/include/asm/atomic.h2
-rw-r--r--include/asm-generic/atomic.h21
-rw-r--r--include/asm-generic/atomic64.h4
-rw-r--r--include/linux/atomic.h13
-rw-r--r--lib/atomic64.c3
29 files changed, 19 insertions, 68 deletions
diff --git a/arch/alpha/include/asm/atomic.h b/arch/alpha/include/asm/atomic.h
index 0eff853398d2..e8c956098424 100644
--- a/arch/alpha/include/asm/atomic.h
+++ b/arch/alpha/include/asm/atomic.h
@@ -110,7 +110,6 @@ static __inline__ long atomic64_##op##_return(long i, atomic64_t * v) \
110ATOMIC_OPS(add) 110ATOMIC_OPS(add)
111ATOMIC_OPS(sub) 111ATOMIC_OPS(sub)
112 112
113#define CONFIG_ARCH_HAS_ATOMIC_OR
114#define atomic_andnot atomic_andnot 113#define atomic_andnot atomic_andnot
115#define atomic64_andnot atomic64_andnot 114#define atomic64_andnot atomic64_andnot
116 115
diff --git a/arch/arc/include/asm/atomic.h b/arch/arc/include/asm/atomic.h
index e90b701fc6a8..2a847821dee1 100644
--- a/arch/arc/include/asm/atomic.h
+++ b/arch/arc/include/asm/atomic.h
@@ -144,7 +144,6 @@ static inline int atomic_##op##_return(int i, atomic_t *v) \
144ATOMIC_OPS(add, +=, add) 144ATOMIC_OPS(add, +=, add)
145ATOMIC_OPS(sub, -=, sub) 145ATOMIC_OPS(sub, -=, sub)
146 146
147#define CONFIG_ARCH_HAS_ATOMIC_OR
148#define atomic_andnot atomic_andnot 147#define atomic_andnot atomic_andnot
149 148
150ATOMIC_OP(and, &=, and) 149ATOMIC_OP(and, &=, and)
diff --git a/arch/arm/include/asm/atomic.h b/arch/arm/include/asm/atomic.h
index ff214bac9cb4..82b75a7cb762 100644
--- a/arch/arm/include/asm/atomic.h
+++ b/arch/arm/include/asm/atomic.h
@@ -194,7 +194,6 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
194ATOMIC_OPS(add, +=, add) 194ATOMIC_OPS(add, +=, add)
195ATOMIC_OPS(sub, -=, sub) 195ATOMIC_OPS(sub, -=, sub)
196 196
197#define CONFIG_ARCH_HAS_ATOMIC_OR
198#define atomic_andnot atomic_andnot 197#define atomic_andnot atomic_andnot
199 198
200ATOMIC_OP(and, &=, and) 199ATOMIC_OP(and, &=, and)
diff --git a/arch/arm64/include/asm/atomic.h b/arch/arm64/include/asm/atomic.h
index 2876173397b2..866a71fca9a3 100644
--- a/arch/arm64/include/asm/atomic.h
+++ b/arch/arm64/include/asm/atomic.h
@@ -85,7 +85,6 @@ static inline int atomic_##op##_return(int i, atomic_t *v) \
85ATOMIC_OPS(add, add) 85ATOMIC_OPS(add, add)
86ATOMIC_OPS(sub, sub) 86ATOMIC_OPS(sub, sub)
87 87
88#define CONFIG_ARCH_HAS_ATOMIC_OR
89#define atomic_andnot atomic_andnot 88#define atomic_andnot atomic_andnot
90 89
91ATOMIC_OP(and, and) 90ATOMIC_OP(and, and)
diff --git a/arch/avr32/include/asm/atomic.h b/arch/avr32/include/asm/atomic.h
index 115d3005e4bc..97c9bdf83409 100644
--- a/arch/avr32/include/asm/atomic.h
+++ b/arch/avr32/include/asm/atomic.h
@@ -51,8 +51,6 @@ static inline void atomic_##op(int i, atomic_t *v) \
51 (void)__atomic_##op##_return(i, v); \ 51 (void)__atomic_##op##_return(i, v); \
52} 52}
53 53
54#define CONFIG_ARCH_HAS_ATOMIC_OR
55
56ATOMIC_OP(and, and) 54ATOMIC_OP(and, and)
57ATOMIC_OP(or, or) 55ATOMIC_OP(or, or)
58ATOMIC_OP(xor, eor) 56ATOMIC_OP(xor, eor)
diff --git a/arch/blackfin/include/asm/atomic.h b/arch/blackfin/include/asm/atomic.h
index eafa55b81a7b..2d6a7a3823c3 100644
--- a/arch/blackfin/include/asm/atomic.h
+++ b/arch/blackfin/include/asm/atomic.h
@@ -28,8 +28,6 @@ asmlinkage int __raw_atomic_test_asm(const volatile int *ptr, int value);
28#define atomic_add_return(i, v) __raw_atomic_add_asm(&(v)->counter, i) 28#define atomic_add_return(i, v) __raw_atomic_add_asm(&(v)->counter, i)
29#define atomic_sub_return(i, v) __raw_atomic_add_asm(&(v)->counter, -(i)) 29#define atomic_sub_return(i, v) __raw_atomic_add_asm(&(v)->counter, -(i))
30 30
31#define CONFIG_ARCH_HAS_ATOMIC_OR
32
33#define atomic_or(i, v) (void)__raw_atomic_or_asm(&(v)->counter, i) 31#define atomic_or(i, v) (void)__raw_atomic_or_asm(&(v)->counter, i)
34#define atomic_and(i, v) (void)__raw_atomic_and_asm(&(v)->counter, i) 32#define atomic_and(i, v) (void)__raw_atomic_and_asm(&(v)->counter, i)
35#define atomic_xor(i, v) (void)__raw_atomic_xor_asm(&(v)->counter, i) 33#define atomic_xor(i, v) (void)__raw_atomic_xor_asm(&(v)->counter, i)
diff --git a/arch/frv/include/asm/atomic.h b/arch/frv/include/asm/atomic.h
index 74d22454d7c6..fc48bea26b40 100644
--- a/arch/frv/include/asm/atomic.h
+++ b/arch/frv/include/asm/atomic.h
@@ -192,8 +192,6 @@ static inline void atomic64_##op(long long i, atomic64_t *v) \
192 (void)__atomic64_fetch_##op(i, &v->counter); \ 192 (void)__atomic64_fetch_##op(i, &v->counter); \
193} 193}
194 194
195#define CONFIG_ARCH_HAS_ATOMIC_OR
196
197ATOMIC_OP(or) 195ATOMIC_OP(or)
198ATOMIC_OP(and) 196ATOMIC_OP(and)
199ATOMIC_OP(xor) 197ATOMIC_OP(xor)
diff --git a/arch/h8300/include/asm/atomic.h b/arch/h8300/include/asm/atomic.h
index f181f820be33..c4d061f09c44 100644
--- a/arch/h8300/include/asm/atomic.h
+++ b/arch/h8300/include/asm/atomic.h
@@ -41,8 +41,6 @@ static inline void atomic_##op(int i, atomic_t *v) \
41ATOMIC_OP_RETURN(add, +=) 41ATOMIC_OP_RETURN(add, +=)
42ATOMIC_OP_RETURN(sub, -=) 42ATOMIC_OP_RETURN(sub, -=)
43 43
44#define CONFIG_ARCH_HAS_ATOMIC_OR
45
46ATOMIC_OP(and, &=) 44ATOMIC_OP(and, &=)
47ATOMIC_OP(or, |=) 45ATOMIC_OP(or, |=)
48ATOMIC_OP(xor, ^=) 46ATOMIC_OP(xor, ^=)
diff --git a/arch/hexagon/include/asm/atomic.h b/arch/hexagon/include/asm/atomic.h
index 4efe2c7c0dd8..811d61f6422d 100644
--- a/arch/hexagon/include/asm/atomic.h
+++ b/arch/hexagon/include/asm/atomic.h
@@ -132,8 +132,6 @@ static inline int atomic_##op##_return(int i, atomic_t *v) \
132ATOMIC_OPS(add) 132ATOMIC_OPS(add)
133ATOMIC_OPS(sub) 133ATOMIC_OPS(sub)
134 134
135#define CONFIG_ARCH_HAS_ATOMIC_OR
136
137ATOMIC_OP(and) 135ATOMIC_OP(and)
138ATOMIC_OP(or) 136ATOMIC_OP(or)
139ATOMIC_OP(xor) 137ATOMIC_OP(xor)
diff --git a/arch/ia64/include/asm/atomic.h b/arch/ia64/include/asm/atomic.h
index 0809ef5d6b9a..be4beeb77d57 100644
--- a/arch/ia64/include/asm/atomic.h
+++ b/arch/ia64/include/asm/atomic.h
@@ -69,8 +69,6 @@ ATOMIC_OP(sub, -)
69 : ia64_atomic_sub(__ia64_asr_i, v); \ 69 : ia64_atomic_sub(__ia64_asr_i, v); \
70}) 70})
71 71
72#define CONFIG_ARCH_HAS_ATOMIC_OR
73
74ATOMIC_OP(and, &) 72ATOMIC_OP(and, &)
75ATOMIC_OP(or, |) 73ATOMIC_OP(or, |)
76ATOMIC_OP(xor, ^) 74ATOMIC_OP(xor, ^)
diff --git a/arch/m32r/include/asm/atomic.h b/arch/m32r/include/asm/atomic.h
index 7245463c1e98..b2a13fbd5be0 100644
--- a/arch/m32r/include/asm/atomic.h
+++ b/arch/m32r/include/asm/atomic.h
@@ -94,8 +94,6 @@ static __inline__ int atomic_##op##_return(int i, atomic_t *v) \
94ATOMIC_OPS(add) 94ATOMIC_OPS(add)
95ATOMIC_OPS(sub) 95ATOMIC_OPS(sub)
96 96
97#define CONFIG_ARCH_HAS_ATOMIC_OR
98
99ATOMIC_OP(and) 97ATOMIC_OP(and)
100ATOMIC_OP(or) 98ATOMIC_OP(or)
101ATOMIC_OP(xor) 99ATOMIC_OP(xor)
diff --git a/arch/m68k/include/asm/atomic.h b/arch/m68k/include/asm/atomic.h
index c30e43ea49a3..93ebd96aa494 100644
--- a/arch/m68k/include/asm/atomic.h
+++ b/arch/m68k/include/asm/atomic.h
@@ -77,8 +77,6 @@ static inline int atomic_##op##_return(int i, atomic_t * v) \
77ATOMIC_OPS(add, +=, add) 77ATOMIC_OPS(add, +=, add)
78ATOMIC_OPS(sub, -=, sub) 78ATOMIC_OPS(sub, -=, sub)
79 79
80#define CONFIG_ARCH_HAS_ATOMIC_OR
81
82ATOMIC_OP(and, &=, and) 80ATOMIC_OP(and, &=, and)
83ATOMIC_OP(or, |=, or) 81ATOMIC_OP(or, |=, or)
84ATOMIC_OP(xor, ^=, eor) 82ATOMIC_OP(xor, ^=, eor)
diff --git a/arch/metag/include/asm/atomic_lnkget.h b/arch/metag/include/asm/atomic_lnkget.h
index 930c12cb8d37..0642606de901 100644
--- a/arch/metag/include/asm/atomic_lnkget.h
+++ b/arch/metag/include/asm/atomic_lnkget.h
@@ -74,8 +74,6 @@ static inline int atomic_##op##_return(int i, atomic_t *v) \
74ATOMIC_OPS(add) 74ATOMIC_OPS(add)
75<