projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
locking/atomic: hexagon: move to ARCH_ATOMIC
[linux-2.6-microblaze.git]
/
arch
/
hexagon
/
include
/
asm
/
cmpxchg.h
diff --git
a/arch/hexagon/include/asm/cmpxchg.h
b/arch/hexagon/include/asm/cmpxchg.h
index
92b8a02
..
cdb705e
100644
(file)
--- a/
arch/hexagon/include/asm/cmpxchg.h
+++ b/
arch/hexagon/include/asm/cmpxchg.h
@@
-42,7
+42,7
@@
static inline unsigned long __xchg(unsigned long x, volatile void *ptr,
* Atomically swap the contents of a register with memory. Should be atomic
* between multiple CPU's and within interrupts on the same CPU.
*/
* Atomically swap the contents of a register with memory. Should be atomic
* between multiple CPU's and within interrupts on the same CPU.
*/
-#define xchg(ptr, v) ((__typeof__(*(ptr)))__xchg((unsigned long)(v), (ptr), \
+#define
arch_
xchg(ptr, v) ((__typeof__(*(ptr)))__xchg((unsigned long)(v), (ptr), \
sizeof(*(ptr))))
/*
sizeof(*(ptr))))
/*
@@
-51,7
+51,7
@@
static inline unsigned long __xchg(unsigned long x, volatile void *ptr,
* variable casting.
*/
* variable casting.
*/
-#define
cmpxchg(ptr, old, new)
\
+#define
arch_cmpxchg(ptr, old, new)
\
({ \
__typeof__(ptr) __ptr = (ptr); \
__typeof__(*(ptr)) __old = (old); \
({ \
__typeof__(ptr) __ptr = (ptr); \
__typeof__(*(ptr)) __old = (old); \