Merge master.kernel.org:/home/rmk/linux-2.6-mmc

[linux-2.6] / include / asm-cris / atomic.h

diff --git a/include/asm-cris/atomic.h b/include/asm-cris/atomic.h
index 45891f7de00fc1c58a9bcc48158c75dc2a386746..2df2c7aa19b7bd373f96ce1859edc3b169d395b8 100644 (file)
--- a/include/asm-cris/atomic.h
+++ b/include/asm-cris/atomic.h
@@ -136,10 +136,25 @@ static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
        return ret;
 }
 
+static inline int atomic_add_unless(atomic_t *v, int a, int u)
+{
+       int ret;
+       unsigned long flags;
+
+       cris_atomic_save(v, flags);
+       ret = v->counter;
+       if (ret != u)
+               v->counter += a;
+       cris_atomic_restore(v, flags);
+       return ret != u;
+}
+#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)
+
 /* Atomic operations are already serializing */
 #define smp_mb__before_atomic_dec()    barrier()
 #define smp_mb__after_atomic_dec()     barrier()
 #define smp_mb__before_atomic_inc()    barrier()
 #define smp_mb__after_atomic_inc()     barrier()
 
+#include <asm-generic/atomic.h>
 #endif