[PATCH 01/19] arch/alpha: rename internal name __xchg to __arch_xchg

[Andrzej Hajda]

__xchg will be used for non-atomic xchg macro.

Signed-off-by: Andrzej Hajda <andrzej.ha...@intel.com>
---
 arch/alpha/include/asm/cmpxchg.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/alpha/include/asm/cmpxchg.h b/arch/alpha/include/asm/cmpxchg.h
index 6e0a850aa9d38c..40e8159ef6e794 100644
--- a/arch/alpha/include/asm/cmpxchg.h
+++ b/arch/alpha/include/asm/cmpxchg.h
@@ -6,7 +6,7 @@
  * Atomic exchange routines.
  */
 
-#define ____xchg(type, args...)                __xchg ## type ## _local(args)
+#define ____xchg(type, args...)                __arch_xchg ## type ## 
_local(args)
 #define ____cmpxchg(type, args...)     __cmpxchg ## type ## _local(args)
 #include <asm/xchg.h>
 
@@ -34,7 +34,7 @@
 
 #undef ____xchg
 #undef ____cmpxchg
-#define ____xchg(type, args...)                __xchg ##type(args)
+#define ____xchg(type, args...)                __arch_xchg ##type(args)
 #define ____cmpxchg(type, args...)     __cmpxchg ##type(args)
 #include <asm/xchg.h>
 
@@ -48,7 +48,7 @@
        __typeof__(*(ptr)) _x_ = (x);                                   \
        smp_mb();                                                       \
        __ret = (__typeof__(*(ptr)))                                    \
-               __xchg((ptr), (unsigned long)_x_, sizeof(*(ptr)));      \
+               __arch_xchg((ptr), (unsigned long)_x_, sizeof(*(ptr))); \
        smp_mb();                                                       \
        __ret;                                                          \
 })
-- 
2.34.1