aboutsummaryrefslogtreecommitdiffstats
path: root/arch/xtensa
diff options
context:
space:
mode:
authorArun Sharma <asharma@fb.com>2011-07-26 19:09:07 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-07-26 19:49:47 -0400
commitf24219b4e90cf70ec4a211b17fbabc725a0ddf3c (patch)
treec1c753bd425d61a5094995d9835b23b46383d9b2 /arch/xtensa
parent60063497a95e716c9a689af3be2687d261f115b4 (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/xtensa')
-rw-r--r--arch/xtensa/include/asm/atomic.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/xtensa/include/asm/atomic.h b/arch/xtensa/include/asm/atomic.h
index 7cca2fb18baf..e464212f9ee6 100644
--- a/arch/xtensa/include/asm/atomic.h
+++ b/arch/xtensa/include/asm/atomic.h
@@ -225,15 +225,15 @@ static inline int atomic_sub_return(int i, atomic_t * v)
225#define atomic_xchg(v, new) (xchg(&((v)->counter), new)) 225#define atomic_xchg(v, new) (xchg(&((v)->counter), new))
226 226
227/** 227/**
228 * atomic_add_unless - add unless the number is a given value 228 * __atomic_add_unless - add unless the number is a given value
229 * @v: pointer of type atomic_t 229 * @v: pointer of type atomic_t
230 * @a: the amount to add to v... 230 * @a: the amount to add to v...
231 * @u: ...unless v is equal to u. 231 * @u: ...unless v is equal to u.
232 * 232 *
233 * Atomically adds @a to @v, so long as it was not @u. 233 * Atomically adds @a to @v, so long as it was not @u.
234 * Returns non-zero if @v was not @u, and zero otherwise. 234 * Returns the old value of @v.
235 */ 235 */
236static __inline__ int atomic_add_unless(atomic_t *v, int a, int u) 236static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
237{ 237{
238 int c, old; 238 int c, old;
239 c = atomic_read(v); 239 c = atomic_read(v);
@@ -245,7 +245,7 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u)
245 break; 245 break;
246 c = old; 246 c = old;
247 } 247 }
248 return c != (u); 248 return c;
249} 249}
250 250
251 251