diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-07-28 19:25:46 +0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-28 19:25:46 +0400 |
| commit | 6124a4e430b64d1577438c8648c59e996d02e73e (patch) | |
| tree | 49cfafad785d1c9e403a5b0d755298b9af2c260f /arch/h8300/include/asm/atomic.h | |
| parent | 8e267f3da5f117d2f1316cf6ddf740f93f1c73aa (diff) | |
| parent | 580975d7f48d7d047e22bb0f42adf7557801d8d4 (diff) | |
| download | linux-6124a4e430b64d1577438c8648c59e996d02e73e.tar.xz | |
Merge branch 'imx/dt' into next/dt
Diffstat (limited to 'arch/h8300/include/asm/atomic.h')
| -rw-r--r-- | arch/h8300/include/asm/atomic.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/h8300/include/asm/atomic.h b/arch/h8300/include/asm/atomic.h index 984221abb66d..f5a38c1f5489 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) #define atomic_xchg(v, new) (xchg(&((v)->counter), new)) -static inline int atomic_add_unless(atomic_t *v, int a, int u) +static inline int __atomic_add_unless(atomic_t *v, int a, int u) { int ret; unsigned long flags; @@ -114,9 +114,8 @@ static inline int atomic_add_unless(atomic_t *v, int a, int u) if (ret != u) v->counter += a; local_irq_restore(flags); - return ret != u; + return ret; } -#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) static __inline__ void atomic_clear_mask(unsigned long mask, unsigned long *v) { @@ -146,5 +145,4 @@ static __inline__ void atomic_set_mask(unsigned long mask, unsigned long *v) #define smp_mb__before_atomic_inc() barrier() #define smp_mb__after_atomic_inc() barrier() -#include <asm-generic/atomic-long.h> #endif /* __ARCH_H8300_ATOMIC __ */ |