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/h8300/include | |
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/h8300/include')
-rw-r--r-- | arch/h8300/include/asm/atomic.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/h8300/include/asm/atomic.h b/arch/h8300/include/asm/atomic.h index b641714774ea..e6d1663625f0 100644 --- a/arch/h8300/include/asm/atomic.h +++ b/arch/h8300/include/asm/atomic.h | |||
@@ -104,7 +104,7 @@ static inline int atomic_cmpxchg(atomic_t *v, int old, int new) | |||
104 | 104 | ||
105 | #define atomic_xchg(v, new) (xchg(&((v)->counter), new)) | 105 | #define atomic_xchg(v, new) (xchg(&((v)->counter), new)) |
106 | 106 | ||
107 | static inline int atomic_add_unless(atomic_t *v, int a, int u) | 107 | static inline int __atomic_add_unless(atomic_t *v, int a, int u) |
108 | { | 108 | { |
109 | int ret; | 109 | int ret; |
110 | unsigned long flags; | 110 | unsigned long flags; |
@@ -114,7 +114,7 @@ static inline int atomic_add_unless(atomic_t *v, int a, int u) | |||
114 | if (ret != u) | 114 | if (ret != u) |
115 | v->counter += a; | 115 | v->counter += a; |
116 | local_irq_restore(flags); | 116 | local_irq_restore(flags); |
117 | return ret != u; | 117 | return ret; |
118 | } | 118 | } |
119 | 119 | ||
120 | static __inline__ void atomic_clear_mask(unsigned long mask, unsigned long *v) | 120 | static __inline__ void atomic_clear_mask(unsigned long mask, unsigned long *v) |