diff options
Diffstat (limited to 'arch/cris/include/asm/atomic.h')
-rw-r--r-- | arch/cris/include/asm/atomic.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/cris/include/asm/atomic.h b/arch/cris/include/asm/atomic.h index ce9f67e4d977..7e90532c5253 100644 --- a/arch/cris/include/asm/atomic.h +++ b/arch/cris/include/asm/atomic.h | |||
@@ -138,7 +138,7 @@ static inline int atomic_cmpxchg(atomic_t *v, int old, int new) | |||
138 | 138 | ||
139 | #define atomic_xchg(v, new) (xchg(&((v)->counter), new)) | 139 | #define atomic_xchg(v, new) (xchg(&((v)->counter), new)) |
140 | 140 | ||
141 | static inline int atomic_add_unless(atomic_t *v, int a, int u) | 141 | static inline int __atomic_add_unless(atomic_t *v, int a, int u) |
142 | { | 142 | { |
143 | int ret; | 143 | int ret; |
144 | unsigned long flags; | 144 | unsigned long flags; |
@@ -148,7 +148,7 @@ static inline int atomic_add_unless(atomic_t *v, int a, int u) | |||
148 | if (ret != u) | 148 | if (ret != u) |
149 | v->counter += a; | 149 | v->counter += a; |
150 | cris_atomic_restore(v, flags); | 150 | cris_atomic_restore(v, flags); |
151 | return ret != u; | 151 | return ret; |
152 | } | 152 | } |
153 | 153 | ||
154 | /* Atomic operations are already serializing */ | 154 | /* Atomic operations are already serializing */ |