From: Mathieu Desnoyers Date: Tue, 8 May 2007 07:34:20 +0000 (-0700) Subject: atomic.h: i386 type safety fix X-Git-Tag: firefly_0821_release~29698 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e656e245d5adf19f3c431e7f7792659c204e32f2;p=firefly-linux-kernel-4.4.55.git atomic.h: i386 type safety fix Remove an explicit cast to an integer type for the result returned by cmpxchg. It is not per se a problem on the i386 architecture, because sizeof(int) == sizeof(long), but whenever this code is cut'n'pasted to a accept passing an atomic64_t value as parameter to cmpxchg, xchg and add_unless, having 64 bits inputs casted to 32 bits. Signed-off-by: Mathieu Desnoyers Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/include/asm-i386/atomic.h b/include/asm-i386/atomic.h index 4dd272331361..08935113206a 100644 --- a/include/asm-i386/atomic.h +++ b/include/asm-i386/atomic.h @@ -207,8 +207,8 @@ static __inline__ int atomic_sub_return(int i, atomic_t *v) return atomic_add_return(-i,v); } -#define atomic_cmpxchg(v, old, new) ((int)cmpxchg(&((v)->counter), old, new)) -#define atomic_xchg(v, new) (xchg(&((v)->counter), new)) +#define atomic_cmpxchg(v, old, new) (cmpxchg(&((v)->counter), (old), (new))) +#define atomic_xchg(v, new) (xchg(&((v)->counter), (new))) /** * atomic_add_unless - add unless the number is already a given value @@ -221,7 +221,7 @@ static __inline__ int atomic_sub_return(int i, atomic_t *v) */ #define atomic_add_unless(v, a, u) \ ({ \ - int c, old; \ + __typeof__((v)->counter) c, old; \ c = atomic_read(v); \ for (;;) { \ if (unlikely(c == (u))) \