The patch titled
atomic: fix atomic_long_cmpxchg/xchg for 64 bit architectures
has been added to the -mm tree. Its filename is
atomic-fix-atomic_long_cmpxchg-xchg-for-64-bit-architectures.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: atomic: fix atomic_long_cmpxchg/xchg for 64 bit architectures
From: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
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: Mathieu Desnoyers <mathieu.desnoyers@xxxxxxxxxx>
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/asm-generic/atomic.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff -puN include/asm-generic/atomic.h~atomic-fix-atomic_long_cmpxchg-xchg-for-64-bit-architectures include/asm-generic/atomic.h
--- a/include/asm-generic/atomic.h~atomic-fix-atomic_long_cmpxchg-xchg-for-64-bit-architectures
+++ a/include/asm-generic/atomic.h
@@ -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 */
_
Patches currently in -mm which might be from heiko.carstens@xxxxxxxxxx are
origin.patch
atomic-fix-atomic_long_cmpxchg-xchg-for-64-bit-architectures.patch
linux-next.patch
ptrace-remove-pt_dtrace-from-avr32-mn10300-parisc-s390-sh-xtensa.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
