ARM: use asm-generic/atomic.h

Make use of asm-generic/atomic.h retaining the smp_mb_... definitions.

Signed-off-by: Chris Packham <judge.packham@gmail.com>
Reviewed-by: Tom Rini <trini@konsulko.com>

diff --git a/arch/arm/include/asm/atomic.h b/arch/arm/include/asm/atomic.h
index 171f4d979281f7739fb40340edabdf11937ee761..5822b0a52c0e2fc059f1b49809e4372b513c4a4c 100644 (file)
--- a/arch/arm/include/asm/atomic.h
+++ b/arch/arm/include/asm/atomic.h
@@ -20,152 +20,8 @@
 #error SMP not supported
 #endif
 
-typedef struct { volatile int counter; } atomic_t;
-#if BITS_PER_LONG == 32
-typedef struct { volatile long long counter; } atomic64_t;
-#else /* BIT_PER_LONG == 32 */
-typedef struct { volatile long counter; } atomic64_t;
-#endif
-
-#define ATOMIC_INIT(i) { (i) }
-
-#ifdef __KERNEL__
 #include <asm/proc-armv/system.h>
-
-#define atomic_read(v) ((v)->counter)
-#define atomic_set(v, i)       (((v)->counter) = (i))
-#define atomic64_read(v)       atomic_read(v)
-#define atomic64_set(v, i)     atomic_set(v, i)
-
-static inline void atomic_add(int i, volatile atomic_t *v)
-{
-       unsigned long flags = 0;
-
-       local_irq_save(flags);
-       v->counter += i;
-       local_irq_restore(flags);
-}
-
-static inline void atomic_sub(int i, volatile atomic_t *v)
-{
-       unsigned long flags = 0;
-
-       local_irq_save(flags);
-       v->counter -= i;
-       local_irq_restore(flags);
-}
-
-static inline void atomic_inc(volatile atomic_t *v)
-{
-       unsigned long flags = 0;
-
-       local_irq_save(flags);
-       v->counter += 1;
-       local_irq_restore(flags);
-}
-
-static inline void atomic_dec(volatile atomic_t *v)
-{
-       unsigned long flags = 0;
-
-       local_irq_save(flags);
-       v->counter -= 1;
-       local_irq_restore(flags);
-}
-
-static inline int atomic_dec_and_test(volatile atomic_t *v)
-{
-       unsigned long flags = 0;
-       int val;
-
-       local_irq_save(flags);
-       val = v->counter;
-       v->counter = val -= 1;
-       local_irq_restore(flags);
-
-       return val == 0;
-}
-
-static inline int atomic_add_negative(int i, volatile atomic_t *v)
-{
-       unsigned long flags = 0;
-       int val;
-
-       local_irq_save(flags);
-       val = v->counter;
-       v->counter = val += i;
-       local_irq_restore(flags);
-
-       return val < 0;
-}
-
-static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr)
-{
-       unsigned long flags = 0;
-
-       local_irq_save(flags);
-       *addr &= ~mask;
-       local_irq_restore(flags);
-}
-
-#if BITS_PER_LONG == 32
-
-static inline void atomic64_add(long long i, volatile atomic64_t *v)
-{
-       unsigned long flags = 0;
-
-       local_irq_save(flags);
-       v->counter += i;
-       local_irq_restore(flags);
-}
-
-static inline void atomic64_sub(long long i, volatile atomic64_t *v)
-{
-       unsigned long flags = 0;
-
-       local_irq_save(flags);
-       v->counter -= i;
-       local_irq_restore(flags);
-}
-
-#else /* BIT_PER_LONG == 32 */
-
-static inline void atomic64_add(long i, volatile atomic64_t *v)
-{
-       unsigned long flags = 0;
-
-       local_irq_save(flags);
-       v->counter += i;
-       local_irq_restore(flags);
-}
-
-static inline void atomic64_sub(long i, volatile atomic64_t *v)
-{
-       unsigned long flags = 0;
-
-       local_irq_save(flags);
-       v->counter -= i;
-       local_irq_restore(flags);
-}
-#endif
-
-static inline void atomic64_inc(volatile atomic64_t *v)
-{
-       unsigned long flags = 0;
-
-       local_irq_save(flags);
-       v->counter += 1;
-       local_irq_restore(flags);
-}
-
-static inline void atomic64_dec(volatile atomic64_t *v)
-{
-       unsigned long flags = 0;
-
-       local_irq_save(flags);
-       v->counter -= 1;
-       local_irq_restore(flags);
-}
+#include <asm-generic/atomic.h>
 
 /* Atomic operations are already serializing on ARM */
 #define smp_mb__before_atomic_dec()    barrier()
@@ -174,4 +30,3 @@ static inline void atomic64_dec(volatile atomic64_t *v)
 #define smp_mb__after_atomic_inc()     barrier()
 
 #endif
-#endif