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/frv | |
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/frv')
-rw-r--r-- | arch/frv/include/asm/atomic.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/frv/include/asm/atomic.h b/arch/frv/include/asm/atomic.h index b07b75f411f2..a51dcdfe1fbf 100644 --- a/arch/frv/include/asm/atomic.h +++ b/arch/frv/include/asm/atomic.h | |||
@@ -241,7 +241,7 @@ extern uint32_t __xchg_32(uint32_t i, volatile void *v); | |||
241 | #define atomic64_cmpxchg(v, old, new) (__cmpxchg_64(old, new, &(v)->counter)) | 241 | #define atomic64_cmpxchg(v, old, new) (__cmpxchg_64(old, new, &(v)->counter)) |
242 | #define atomic64_xchg(v, new) (__xchg_64(new, &(v)->counter)) | 242 | #define atomic64_xchg(v, new) (__xchg_64(new, &(v)->counter)) |
243 | 243 | ||
244 | static __inline__ int atomic_add_unless(atomic_t *v, int a, int u) | 244 | static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u) |
245 | { | 245 | { |
246 | int c, old; | 246 | int c, old; |
247 | c = atomic_read(v); | 247 | c = atomic_read(v); |
@@ -253,7 +253,7 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u) | |||
253 | break; | 253 | break; |
254 | c = old; | 254 | c = old; |
255 | } | 255 | } |
256 | return c != (u); | 256 | return c; |
257 | } | 257 | } |
258 | 258 | ||
259 | 259 | ||