Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit a5fc1abe438b87a9d128beebc377f78e2681a76d

Authored by Heiko Carstens
Committed by Linus Torvalds
1 parent 9e040a3e91
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Acked-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff

include/asm-generic/atomic.h
Diff comments   View file @ a5fc1ab
... ... @@ -132,9 +132,9 @@
132 132 #define atomic_long_inc_not_zero(l) atomic64_inc_not_zero((atomic64_t *)(l))
133 133  
134 134 #define atomic_long_cmpxchg(l, old, new) \
135   - (atomic_cmpxchg((atomic64_t *)(l), (old), (new)))
  135 + (atomic64_cmpxchg((atomic64_t *)(l), (old), (new)))
136 136 #define atomic_long_xchg(v, new) \
137   - (atomic_xchg((atomic64_t *)(l), (new)))
  137 + (atomic64_xchg((atomic64_t *)(l), (new)))
138 138  
139 139 #else /* BITS_PER_LONG == 64 */
140 140