Merge branch 'locking-arch-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull arch atomic cleanups from Ingo Molnar:
 "This is a series kept separate from the main locking tree, which
  cleans up and improves various details in the atomics type handling:

   - Remove the unused atomic_or_long() method

   - Consolidate and compress atomic ops implementations between
     architectures, to reduce linecount and to make it easier to add new
     ops.

   - Rewrite generic atomic support to only require cmpxchg() from an
     architecture - generate all other methods from that"

* 'locking-arch-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (23 commits)
  locking,arch: Use ACCESS_ONCE() instead of cast to volatile in atomic_read()
  locking, mips: Fix atomics
  locking, sparc64: Fix atomics
  locking,arch: Rewrite generic atomic support
  locking,arch,xtensa: Fold atomic_ops
  locking,arch,sparc: Fold atomic_ops
  locking,arch,sh: Fold atomic_ops
  locking,arch,powerpc: Fold atomic_ops
  locking,arch,parisc: Fold atomic_ops
  locking,arch,mn10300: Fold atomic_ops
  locking,arch,mips: Fold atomic_ops
  locking,arch,metag: Fold atomic_ops
  locking,arch,m68k: Fold atomic_ops
  locking,arch,m32r: Fold atomic_ops
  locking,arch,ia64: Fold atomic_ops
  locking,arch,hexagon: Fold atomic_ops
  locking,arch,cris: Fold atomic_ops
  locking,arch,avr32: Fold atomic_ops
  locking,arch,arm64: Fold atomic_ops
  locking,arch,arm: Fold atomic_ops
  ...

1 files changed, 71 insertions, 46 deletions

diff --git a/arch/parisc/include/asm/atomic.h b/arch/parisc/include/asm/atomic.h
index 0be2db2c7d44..226f8ca993f6 100644
--- a/arch/parisc/include/asm/atomic.h
+++ b/arch/parisc/include/asm/atomic.h
@@ -55,24 +55,7 @@ extern arch_spinlock_t __atomic_hash[ATOMIC_HASH_SIZE] __lock_aligned;
  * are atomic, so a reader never sees inconsistent values.
  */
 
-/* It's possible to reduce all atomic operations to either
- * __atomic_add_return, atomic_set and atomic_read (the latter
- * is there only for consistency).
- */
-
-static __inline__ int __atomic_add_return(int i, atomic_t *v)
-{
-        int ret;
-        unsigned long flags;
-        _atomic_spin_lock_irqsave(v, flags);
-
-        ret = (v->counter += i);
-
-        _atomic_spin_unlock_irqrestore(v, flags);
-        return ret;
-}
-
-static __inline__ void atomic_set(atomic_t *v, int i) 
+static __inline__ void atomic_set(atomic_t *v, int i)
 {
         unsigned long flags;
         _atomic_spin_lock_irqsave(v, flags);
@@ -84,7 +67,7 @@ static __inline__ void atomic_set(atomic_t *v, int i)
 
 static __inline__ int atomic_read(const atomic_t *v)
 {
-        return (*(volatile int *)&(v)->counter);
+        return ACCESS_ONCE((v)->counter);
 }
 
 /* exported interface */
@@ -115,16 +98,43 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
         return c;
 }
 
+#define ATOMIC_OP(op, c_op)                                             \
+static __inline__ void atomic_##op(int i, atomic_t *v)                  \
+{                                                                       \
+        unsigned long flags;                                            \
+                                                                        \
+        _atomic_spin_lock_irqsave(v, flags);                            \
+        v->counter c_op i;                                              \
+        _atomic_spin_unlock_irqrestore(v, flags);                       \
+}                                                                       \
+
+#define ATOMIC_OP_RETURN(op, c_op)                                      \
+static __inline__ int atomic_##op##_return(int i, atomic_t *v)          \
+{                                                                       \
+        unsigned long flags;                                            \
+        int ret;                                                        \
+                                                                        \
+        _atomic_spin_lock_irqsave(v, flags);                            \
+        ret = (v->counter c_op i);                                      \
+        _atomic_spin_unlock_irqrestore(v, flags);                       \
+                                                                        \
+        return ret;                                                     \
+}
+
+#define ATOMIC_OPS(op, c_op) ATOMIC_OP(op, c_op) ATOMIC_OP_RETURN(op, c_op)
+
+ATOMIC_OPS(add, +=)
+ATOMIC_OPS(sub, -=)
+
+#undef ATOMIC_OPS
+#undef ATOMIC_OP_RETURN
+#undef ATOMIC_OP
 
-#define atomic_add(i,v) ((void)(__atomic_add_return(        (i),(v))))
-#define atomic_sub(i,v) ((void)(__atomic_add_return(-((int) (i)),(v))))
-#define atomic_inc(v)   ((void)(__atomic_add_return(   1,(v))))
-#define atomic_dec(v)   ((void)(__atomic_add_return(  -1,(v))))
+#define atomic_inc(v)   (atomic_add(   1,(v)))
+#define atomic_dec(v)   (atomic_add(  -1,(v)))
 
-#define atomic_add_return(i,v)  (__atomic_add_return( (i),(v)))
-#define atomic_sub_return(i,v)  (__atomic_add_return(-(i),(v)))
-#define atomic_inc_return(v)    (__atomic_add_return(   1,(v)))
-#define atomic_dec_return(v)    (__atomic_add_return(  -1,(v)))
+#define atomic_inc_return(v)    (atomic_add_return(   1,(v)))
+#define atomic_dec_return(v)    (atomic_add_return(  -1,(v)))
 
 #define atomic_add_negative(a, v)       (atomic_add_return((a), (v)) < 0)
 
@@ -148,18 +158,37 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
 
 #define ATOMIC64_INIT(i) { (i) }
 
-static __inline__ s64
-__atomic64_add_return(s64 i, atomic64_t *v)
-{
-        s64 ret;
-        unsigned long flags;
-        _atomic_spin_lock_irqsave(v, flags);
+#define ATOMIC64_OP(op, c_op)                                           \
+static __inline__ void atomic64_##op(s64 i, atomic64_t *v)              \
+{                                                                       \
+        unsigned long flags;                                            \
+                                                                        \
+        _atomic_spin_lock_irqsave(v, flags);                            \
+        v->counter c_op i;                                              \
+        _atomic_spin_unlock_irqrestore(v, flags);                       \
+}                                                                       \
+
+#define ATOMIC64_OP_RETURN(op, c_op)                                    \
+static __inline__ s64 atomic64_##op##_return(s64 i, atomic64_t *v)      \
+{                                                                       \
+        unsigned long flags;                                            \
+        s64 ret;                                                        \
+                                                                        \
+        _atomic_spin_lock_irqsave(v, flags);                            \
+        ret = (v->counter c_op i);                                      \
+        _atomic_spin_unlock_irqrestore(v, flags);                       \
+                                                                        \
+        return ret;                                                     \
+}
 
-        ret = (v->counter += i);
+#define ATOMIC64_OPS(op, c_op) ATOMIC64_OP(op, c_op) ATOMIC64_OP_RETURN(op, c_op)
 
-        _atomic_spin_unlock_irqrestore(v, flags);
-        return ret;
-}
+ATOMIC64_OPS(add, +=)
+ATOMIC64_OPS(sub, -=)
+
+#undef ATOMIC64_OPS
+#undef ATOMIC64_OP_RETURN
+#undef ATOMIC64_OP
 
 static __inline__ void
 atomic64_set(atomic64_t *v, s64 i)
@@ -175,18 +204,14 @@ atomic64_set(atomic64_t *v, s64 i)
 static __inline__ s64
 atomic64_read(const atomic64_t *v)
 {
-        return (*(volatile long *)&(v)->counter);
+        return ACCESS_ONCE((v)->counter);
 }
 
-#define atomic64_add(i,v)       ((void)(__atomic64_add_return( ((s64)(i)),(v))))
-#define atomic64_sub(i,v)       ((void)(__atomic64_add_return(-((s64)(i)),(v))))
-#define atomic64_inc(v)         ((void)(__atomic64_add_return(   1,(v))))
-#define atomic64_dec(v)         ((void)(__atomic64_add_return(  -1,(v))))
+#define atomic64_inc(v)         (atomic64_add(   1,(v)))
+#define atomic64_dec(v)         (atomic64_add(  -1,(v)))
 
-#define atomic64_add_return(i,v)        (__atomic64_add_return( ((s64)(i)),(v)))
-#define atomic64_sub_return(i,v)        (__atomic64_add_return(-((s64)(i)),(v)))
-#define atomic64_inc_return(v)          (__atomic64_add_return(   1,(v)))
-#define atomic64_dec_return(v)          (__atomic64_add_return(  -1,(v)))
+#define atomic64_inc_return(v)          (atomic64_add_return(   1,(v)))
+#define atomic64_dec_return(v)          (atomic64_add_return(  -1,(v)))
 
 #define atomic64_add_negative(a, v)     (atomic64_add_return((a), (v)) < 0)