mutex subsystem, add atomic_cmpxchg() to all arches
PATCH 2/8 mutex subsystem, add atomic_cmpxchg() to all arches
add atomic_cmpxchg() to all the architectures. Needed by the new mutex code.
Signed-off-by Ingo Molnar <[email protected]>
----
include/asm-alpha/atomic.h | 1 + include/asm-arm/atomic.h | 2 ++ include/asm-arm26/atomic.h | 2 ++ include/asm-cris/atomic.h | 2 ++ include/asm-frv/atomic.h | 1 + include/asm-h8300/atomic.h | 2 ++ include/asm-i386/atomic.h | 1 + include/asm-ia64/atomic.h | 1 + include/asm-m32r/atomic.h | 1 + include/asm-m68k/atomic.h | 1 + include/asm-m68knommu/atomic.h | 1 + include/asm-mips/atomic.h | 1 + include/asm-parisc/atomic.h | 1 + include/asm-powerpc/atomic.h | 1 + include/asm-s390/atomic.h | 1 + include/asm-sh/atomic.h | 2 ++ include/asm-sh64/atomic.h | 2 ++ include/asm-sparc/atomic.h | 1 + include/asm-sparc64/atomic.h | 1 + include/asm-v850/atomic.h | 2 ++ include/asm-x86_64/atomic.h | 1 + include/asm-xtensa/atomic.h | 1 + 22 files changed, 29 insertions(+)
include/asm-alpha/atomic.h +1 -0
@@ -176,6 +176,7 @@ static __inline__ long atomic64_sub_retu }#define atomic_cmpxchg (v, o, n) ((int)cmpxchg(&((v)->counter), (o), (n))) +#define atomic_xchg (v, new) (xchg(&((v)->counter), new))#define atomic_add_unless (v, a, u) \ ({ \
include/asm-arm/atomic.h +2 -0
@@ -99,6 +99,8 @@ static inline int atomic_cmpxchg(atomic_return oldval; } +#define atomic_xchg (v, new) (xchg(&((v)->counter), new)) +static inline void atomic_clear_mask (unsigned long mask,unsigned long *addr) {unsigned long tmp, tmp2;
include/asm-arm26/atomic.h +2 -0
@@ -76,6 +76,8 @@ static inline int atomic_cmpxchg(atomic_return ret; } +#define atomic_xchg (v, new) (xchg(&((v)->counter), new)) +static inline int atomic_add_unless (atomic_t *v,int a,int u) {int ret;
include/asm-cris/atomic.h +2 -0
@@ -136,6 +136,8 @@ static inline int atomic_cmpxchg(atomic_return ret; } +#define atomic_xchg (v, new) (xchg(&((v)->counter), new)) +static inline int atomic_add_unless (atomic_t *v,int a,int u) {int ret;
include/asm-frv/atomic.h +1 -0
@@ -415,6 +415,7 @@ extern uint32_t __cmpxchg_32(uint32_t *v#endif #define atomic_cmpxchg (v, old, new) ((int)cmpxchg(&((v)->counter), old, new)) +#define atomic_xchg (v, new) (xchg(&((v)->counter), new))#define atomic_add_unless (v, a, u) \ ({ \
include/asm-h8300/atomic.h +2 -0
@@ -95,6 +95,8 @@ static inline int atomic_cmpxchg(atomic_return ret; } +#define atomic_xchg (v, new) (xchg(&((v)->counter), new)) +static inline int atomic_add_unless (atomic_t *v,int a,int u) {int ret;
include/asm-i386/atomic.h +1 -0
@@ -216,6 +216,7 @@ static __inline__ int atomic_sub_return( }#define atomic_cmpxchg (v, old, new) ((int)cmpxchg(&((v)->counter), old, new)) +#define atomic_xchg (v, new) (xchg(&((v)->counter), new))/** * atomic_add_unless - add unless the number is a given value
include/asm-ia64/atomic.h +1 -0
@@ -89,6 +89,7 @@ ia64_atomic64_sub (__s64 i, atomic64_t * }#define atomic_cmpxchg (v, old, new) ((int)cmpxchg(&((v)->counter), old, new)) +#define atomic_xchg (v, new) (xchg(&((v)->counter), new))#define atomic_add_unless (v, a, u) \ ({ \
include/asm-m32r/atomic.h +1 -0
@@ -243,6 +243,7 @@ static __inline__ int atomic_dec_return(#define atomic_add_negative (i,v) (atomic_add_return((i), (v)) < 0)#define atomic_cmpxchg (v, o, n) ((int)cmpxchg(&((v)->counter), (o), (n))) +#define atomic_xchg (v, new) (xchg(&((v)->counter), new))/** * atomic_add_unless - add unless the number is a given value
include/asm-m68k/atomic.h +1 -0
@@ -140,6 +140,7 @@ static inline void atomic_set_mask(unsig }#define atomic_cmpxchg (v, o, n) ((int)cmpxchg(&((v)->counter), (o), (n))) +#define atomic_xchg (v, new) (xchg(&((v)->counter), new))#define atomic_add_unless (v, a, u) \ ({ \
include/asm-m68knommu/atomic.h +1 -0
@@ -129,6 +129,7 @@ static inline int atomic_sub_return(int }#define atomic_cmpxchg (v, o, n) ((int)cmpxchg(&((v)->counter), (o), (n))) +#define atomic_xchg (v, new) (xchg(&((v)->counter), new))#define atomic_add_unless (v, a, u) \ ({ \
include/asm-mips/atomic.h +1 -0
@@ -289,6 +289,7 @@ static __inline__ int atomic_sub_if_posi }#define atomic_cmpxchg (v, o, n) ((int)cmpxchg(&((v)->counter), (o), (n))) +#define atomic_xchg (v, new) (xchg(&((v)->counter), new))/** * atomic_add_unless - add unless the number is a given value
include/asm-parisc/atomic.h +1 -0
@@ -165,6 +165,7 @@ static __inline__ int atomic_read(const/* exported interface */ #define atomic_cmpxchg (v, o, n) ((int)cmpxchg(&((v)->counter), (o), (n))) +#define atomic_xchg (v, new) (xchg(&((v)->counter), new))/** * atomic_add_unless - add unless the number is a given value
include/asm-powerpc/atomic.h +1 -0
@@ -165,6 +165,7 @@ static __inline__ int atomic_dec_return( }#define atomic_cmpxchg (v, o, n) ((int)cmpxchg(&((v)->counter), (o), (n))) +#define atomic_xchg (v, new) (xchg(&((v)->counter), new))/** * atomic_add_unless - add unless the number is a given value
include/asm-s390/atomic.h +1 -0
@@ -199,6 +199,7 @@ atomic_compare_and_swap(int expected_old }#define atomic_cmpxchg (v, o, n) (atomic_compare_and_swap((o), (n), &((v)->counter))) +#define atomic_xchg (v, new) (xchg(&((v)->counter), new))#define atomic_add_unless (v, a, u) \ ({ \
include/asm-sh/atomic.h +2 -0
@@ -101,6 +101,8 @@ static inline int atomic_cmpxchg(atomic_return ret; } +#define atomic_xchg (v, new) (xchg(&((v)->counter), new)) +static inline int atomic_add_unless (atomic_t *v,int a,int u) {int ret;
include/asm-sh64/atomic.h +2 -0
@@ -113,6 +113,8 @@ static inline int atomic_cmpxchg(atomic_return ret; } +#define atomic_xchg (v, new) (xchg(&((v)->counter), new)) +static inline int atomic_add_unless (atomic_t *v,int a,int u) {int ret;
include/asm-sparc/atomic.h +1 -0
@@ -20,6 +20,7 @@ typedef struct { volatile int counter; }extern int __atomic_add_return (int ,atomic_t *);extern int atomic_cmpxchg (atomic_t *,int ,int ); +#define atomic_xchg (v, new) (xchg(&((v)->counter), new))extern int atomic_add_unless (atomic_t *,int ,int );extern void atomic_set (atomic_t *,int );
include/asm-sparc64/atomic.h +1 -0
@@ -72,6 +72,7 @@ extern int atomic64_sub_ret(int, atomic6#define atomic64_add_negative (i, v) (atomic64_add_ret(i, v) < 0)#define atomic_cmpxchg (v, o, n) ((int)cmpxchg(&((v)->counter), (o), (n))) +#define atomic_xchg (v, new) (xchg(&((v)->counter), new))#define atomic_add_unless (v, a, u) \ ({ \
include/asm-v850/atomic.h +2 -0
@@ -104,6 +104,8 @@ static inline int atomic_cmpxchg(atomic_return ret; } +#define atomic_xchg (v, new) (xchg(&((v)->counter), new)) +static inline int atomic_add_unless (atomic_t *v,int a,int u) {int ret;
include/asm-x86_64/atomic.h +1 -0
@@ -389,6 +389,7 @@ static __inline__ long atomic64_sub_retu#define atomic64_dec_return (v) (atomic64_sub_return(1,v))#define atomic_cmpxchg (v, old, new) ((int)cmpxchg(&((v)->counter), old, new)) +#define atomic_xchg (v, new) (xchg(&((v)->counter), new))/** * atomic_add_unless - add unless the number is a given value
include/asm-xtensa/atomic.h +1 -0
@@ -224,6 +224,7 @@ static inline int atomic_sub_return(int#define atomic_add_negative (i,v) (atomic_add_return((i),(v)) < 0)#define atomic_cmpxchg (v, o, n) ((int)cmpxchg(&((v)->counter), (o), (n))) +#define atomic_xchg (v, new) (xchg(&((v)->counter), new))/** * atomic_add_unless - add unless the number is a given value
Quoted 1 line · Ingo Molnar
add
atomic_cmpxchg()to all the architectures. Needed by the new mutex code.
You add atomic_xchg(), since the above exists already.
Please fixup your patch description!
include/asm-alpha/atomic.h static __inline__ long atomic64_sub_retu · line 179
Quoted 9 lines
Index:
linux/include/asm-alpha/atomic.h
===================================================================include/asm-alpha/atomic.h +1
-0@@ -176,6 +176,7 @@ static __inline__ long atomic64_sub_retu }#define atomic_cmpxchg (v, o, n) ((int)cmpxchg(&((v)->counter), (o), (n))) +#define atomic_xchg (v, new) (xchg(&((v)->counter), new))
^^^^^^^^^^^^^^^^^^^^^^ see?
Regards
Ingo Oeser
Quoted 6 lines · Ingo Oeser
Quoted 1 line · Ingo Molnar
add
atomic_cmpxchg()to all the architectures. Needed by the new mutex code.You add
atomic_xchg(), since the above exists already.Please fixup your patch description!
thanks, done.
Ingo