Commit b7e2a638 authored by Al Viro's avatar Al Viro Committed by Paul E. McKenney
Browse files

sparc32: make the first argument of __cmpxchg_u64() volatile u64 * 



... to match all cmpxchg variants.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarPaul E. McKenney <paulmck@kernel.org>
parent 2f528020

arch/sparc/include/asm/cmpxchg_32.h

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ __cmpxchg(volatile void *ptr, unsigned long old, unsigned long new_, int size) 
			(unsigned long)_n_, sizeof(*(ptr)));		\

})



u64 __cmpxchg_u64(u64 *ptr, u64 old, u64 new);

u64 __cmpxchg_u64(volatile u64 *ptr, u64 old, u64 new);

#define arch_cmpxchg64(ptr, old, new)	__cmpxchg_u64(ptr, old, new)



#include <asm-generic/cmpxchg-local.h>

arch/sparc/lib/atomic32.c

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ u32 __cmpxchg_u32(volatile u32 *ptr, u32 old, u32 new) 
}

EXPORT_SYMBOL(__cmpxchg_u32);



u64 __cmpxchg_u64(u64 *ptr, u64 old, u64 new)

u64 __cmpxchg_u64(volatile u64 *ptr, u64 old, u64 new)

{

	unsigned long flags;

	u64 prev;