Skip to content

Commit b7e2a63

Browse files
Al Viropaulmckrcu
authored andcommitted
sparc32: make the first argument of __cmpxchg_u64() volatile u64 *
... to match all cmpxchg variants. Signed-off-by: Al Viro <[email protected]> Signed-off-by: Paul E. McKenney <[email protected]>
1 parent 2f52802 commit b7e2a63

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

arch/sparc/include/asm/cmpxchg_32.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ __cmpxchg(volatile void *ptr, unsigned long old, unsigned long new_, int size)
6363
(unsigned long)_n_, sizeof(*(ptr))); \
6464
})
6565

66-
u64 __cmpxchg_u64(u64 *ptr, u64 old, u64 new);
66+
u64 __cmpxchg_u64(volatile u64 *ptr, u64 old, u64 new);
6767
#define arch_cmpxchg64(ptr, old, new) __cmpxchg_u64(ptr, old, new)
6868

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

arch/sparc/lib/atomic32.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ u32 __cmpxchg_u32(volatile u32 *ptr, u32 old, u32 new)
173173
}
174174
EXPORT_SYMBOL(__cmpxchg_u32);
175175

176-
u64 __cmpxchg_u64(u64 *ptr, u64 old, u64 new)
176+
u64 __cmpxchg_u64(volatile u64 *ptr, u64 old, u64 new)
177177
{
178178
unsigned long flags;
179179
u64 prev;

0 commit comments

Comments
 (0)