diff options
Diffstat (limited to 'arch/arm/include/asm/atomic.h')
-rw-r--r-- | arch/arm/include/asm/atomic.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/arch/arm/include/asm/atomic.h b/arch/arm/include/asm/atomic.h index 7e79503ab89..86976d03438 100644 --- a/arch/arm/include/asm/atomic.h +++ b/arch/arm/include/asm/atomic.h | |||
@@ -208,16 +208,15 @@ 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 | #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) | ||
221 | 220 | ||
222 | #define atomic_inc(v) atomic_add(1, v) | 221 | #define atomic_inc(v) atomic_add(1, v) |
223 | #define atomic_dec(v) atomic_sub(1, v) | 222 | #define atomic_dec(v) atomic_sub(1, v) |
@@ -460,9 +459,6 @@ static inline int atomic64_add_unless(atomic64_t *v, u64 a, u64 u) | |||
460 | #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0) | 459 | #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0) |
461 | #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL) | 460 | #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL) |
462 | 461 | ||
463 | #else /* !CONFIG_GENERIC_ATOMIC64 */ | 462 | #endif /* !CONFIG_GENERIC_ATOMIC64 */ |
464 | #include <asm-generic/atomic64.h> | ||
465 | #endif | ||
466 | #include <asm-generic/atomic-long.h> | ||
467 | #endif | 463 | #endif |
468 | #endif | 464 | #endif |