atomic: fix atomic_long_cmpxchg/xchg for 64 bit architectures
Subsystems (2)
PATCH 1/1 atomic: fix atomic_long_cmpxchg/xchg for 64 bit architectures
From: Heiko Carstens <[email protected]>
On a linux-next allyesconfig build:
kernel/trace/ring_buffer.c:1726:
warning: passing argument 1 of 'atomic_cmpxchg' from incompatible pointer typelinux-next/arch/s390/include/asm/atomic.h:112:
note: expected 'struct atomic_t *' but argument is of type 'struct atomic64_t *'
atomic_long_cmpxchg and atomic_long_xchg are incorrectly defined for 64 bit architectures. They should be mapped to the atomic64_* variants.
--- include/asm-generic/atomic.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
include/asm-generic/atomic.h +2 -2
@@ -132,9 +132,9 @@ static inline long atomic_long_add_unles#define atomic_long_inc_not_zero (l) atomic64_inc_not_zero((atomic64_t *)(l))#define atomic_long_cmpxchg (l, old, new) \ - (atomic_cmpxchg((atomic64_t *)(l), (old), (new))) + (atomic64_cmpxchg((atomic64_t *)(l), (old), (new)))#define atomic_long_xchg (v, new) \ - (atomic_xchg((atomic64_t *)(l), (new))) + (atomic64_xchg((atomic64_t *)(l), (new)))#else /* BITS_PER_LONG == 64 */
Quoted 23 lines · * Heiko Carstens ([email protected]) wrote:
From: Heiko Carstens <[email protected]>
On a linux-next allyesconfig build:
kernel/trace/ring_buffer.c:1726:
warning: passing argument 1 of 'atomic_cmpxchg' from incompatible pointer typelinux-next/arch/s390/include/asm/atomic.h:112:
note: expected 'structatomic_t*' but argument is of type 'structatomic64_t*'
atomic_long_cmpxchgandatomic_long_xchgare incorrectly defined for 64 bit architectures. They should be mapped to the atomic64_* variants.Cc Mathieu Desnoyers <[email protected]>Signed-off-by Heiko Carstens <[email protected]>--- include/asm-generic/atomic.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)Index:
linux-next/include/asm-generic/atomic.h
===================================================================
include/asm-generic/atomic.h static inline long atomic_long_add_unles · line 137
Quoted 8 lines
include/asm-generic/atomic.h +2
-2@@ -132,9 +132,9 @@ static inline long atomic_long_add_unles#define atomic_long_inc_not_zero (l) atomic64_inc_not_zero((atomic64_t *)(l))#define atomic_long_cmpxchg (l, old, new) \ - (atomic_cmpxchg((atomic64_t *)(l), (old), (new))) + (atomic64_cmpxchg((atomic64_t *)(l), (old), (new)))#define atomic_long_xchg (v, new) \ - (atomic_xchg((atomic64_t *)(l), (new))) + (atomic64_xchg((atomic64_t *)(l), (new)))
Other architectures usually define something along the lines of :
include/asm/atomic.h:#define atomic64_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
This is why they did not care about calling atomic_cmpxchg or atomic64_cmpxchg.
This fix looks good. Thanks !
Quoted 3 lines
include/asm-generic/atomic.h +0
-0#else /* BITS_PER_LONG == 64 */
Signature · 2 lines
Mathieu Desnoyers OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68
Quoted 23 lines · Heiko Carstens
From: Heiko Carstens <[email protected]>
On a linux-next allyesconfig build:
kernel/trace/ring_buffer.c:1726:
warning: passing argument 1 of 'atomic_cmpxchg' from incompatible pointer typelinux-next/arch/s390/include/asm/atomic.h:112:
note: expected 'structatomic_t*' but argument is of type 'structatomic64_t*'
atomic_long_cmpxchgandatomic_long_xchgare incorrectly defined for 64 bit architectures. They should be mapped to the atomic64_* variants.Cc Mathieu Desnoyers <[email protected]>Signed-off-by Heiko Carstens <[email protected]>--- include/asm-generic/atomic.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)Index:
linux-next/include/asm-generic/atomic.h
===================================================================
include/asm-generic/atomic.h static inline long atomic_long_add_unles · line 137
Quoted 8 lines
include/asm-generic/atomic.h +2
-2@@ -132,9 +132,9 @@ static inline long atomic_long_add_unles#define atomic_long_inc_not_zero (l) atomic64_inc_not_zero((atomic64_t *)(l))#define atomic_long_cmpxchg (l, old, new) \ - (atomic_cmpxchg((atomic64_t *)(l), (old), (new))) + (atomic64_cmpxchg((atomic64_t *)(l), (old), (new)))#define atomic_long_xchg (v, new) \ - (atomic_xchg((atomic64_t *)(l), (new))) + (atomic64_xchg((atomic64_t *)(l), (new)))
That's due to the local_cmpchg() use the tracing tree grew recently, right? It appears it was never used in generic code before.
Ingo