diff options
author | Arun Sharma <asharma@fb.com> | 2011-07-26 19:09:07 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-26 19:49:47 -0400 |
commit | f24219b4e90cf70ec4a211b17fbabc725a0ddf3c (patch) | |
tree | c1c753bd425d61a5094995d9835b23b46383d9b2 /arch/arm/include/asm/atomic.h | |
parent | 60063497a95e716c9a689af3be2687d261f115b4 (diff) |
atomic: move atomic_add_unless to generic code
This is in preparation for more generic atomic primitives based on
__atomic_add_unless.
Signed-off-by: Arun Sharma <asharma@fb.com>
Signed-off-by: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
Reviewed-by: Eric Dumazet <eric.dumazet@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: David Miller <davem@davemloft.net>
Acked-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/arm/include/asm/atomic.h')
-rw-r--r-- | arch/arm/include/asm/atomic.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/include/asm/atomic.h b/arch/arm/include/asm/atomic.h index 4d501f1bdc9d..3757e91c5281 100644 --- a/arch/arm/include/asm/atomic.h +++ b/arch/arm/include/asm/atomic.h | |||
@@ -208,14 +208,14 @@ static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr) | |||
208 | 208 | ||
209 | #define atomic_xchg(v, new) (xchg(&((v)->counter), new)) | 209 | #define atomic_xchg(v, new) (xchg(&((v)->counter), new)) |
210 | 210 | ||
211 | static inline int atomic_add_unless(atomic_t *v, int a, int u) | 211 | static inline int __atomic_add_unless(atomic_t *v, int a, int u) |
212 | { | 212 | { |
213 | int c, old; | 213 | int c, old; |
214 | 214 | ||
215 | c = atomic_read(v); | 215 | c = atomic_read(v); |
216 | while (c != u && (old = atomic_cmpxchg((v), c, c + a)) != c) | 216 | while (c != u && (old = atomic_cmpxchg((v), c, c + a)) != c) |
217 | c = old; | 217 | c = old; |
218 | return c != u; | 218 | return c; |
219 | } | 219 | } |
220 | 220 | ||
221 | #define atomic_inc(v) atomic_add(1, v) | 221 | #define atomic_inc(v) atomic_add(1, v) |