Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5fc1abe authored by Heiko Carstens's avatar Heiko Carstens Committed by Linus Torvalds
Browse files

atomic: fix atomic_long_cmpxchg/xchg for 64 bit architectures 



On a linux-next allyesconfig build:

kernel/trace/ring_buffer.c:1726:
	warning: passing argument 1 of 'atomic_cmpxchg' from incompatible pointer type
linux-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.

Acked-by: default avatarMathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Acked-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9e040a3e

include/asm-generic/atomic.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -132,9 +132,9 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u) 
#define atomic_long_inc_not_zero(l) atomic64_inc_not_zero((atomic64_t *)(l))

#define atomic_long_inc_not_zero(l) atomic64_inc_not_zero((atomic64_t *)(l))





#define atomic_long_cmpxchg(l, old, new) \

#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) \

#define atomic_long_xchg(v, new) \

	(atomic_xchg((atomic64_t *)(l), (new)))

	(atomic64_xchg((atomic64_t *)(l), (new)))





#else  /*  BITS_PER_LONG == 64  */

#else  /*  BITS_PER_LONG == 64  */