X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=urcu%2Fuatomic_arch_x86.h;h=09a5bbbbfa0f98fa1b7b840a06fc5e4dde5e1dbf;hb=28ca843d76e4fdc88dc51c4ae444d41446158e83;hp=666e498f326c4c3b8ce025352b3f385416dbc32b;hpb=f469d83969772a24539eaa24430bc73347a882a3;p=urcu.git

diff --git a/urcu/uatomic_arch_x86.h b/urcu/uatomic_arch_x86.h
index 666e498..09a5bbb 100644
--- a/urcu/uatomic_arch_x86.h
+++ b/urcu/uatomic_arch_x86.h
@@ -30,18 +30,6 @@
 extern "C" {
 #endif 
 
-#ifndef __SIZEOF_LONG__
-#if defined(__x86_64__) || defined(__amd64__)
-#define __SIZEOF_LONG__ 8
-#else
-#define __SIZEOF_LONG__ 4
-#endif
-#endif
-
-#ifndef BITS_PER_LONG
-#define BITS_PER_LONG	(__SIZEOF_LONG__ * 8)
-#endif
-
 /*
  * Derived from AO_compare_and_swap() and AO_test_and_set_full().
  */
@@ -51,7 +39,7 @@ struct __uatomic_dummy {
 };
 #define __hp(x)	((struct __uatomic_dummy *)(x))
 
-#define _uatomic_set(addr, v)	STORE_SHARED(*(addr), (v))
+#define _uatomic_set(addr, v)	CMM_STORE_SHARED(*(addr), (v))
 
 /* cmpxchg */
 
@@ -93,7 +81,7 @@ unsigned long __uatomic_cmpxchg(void *addr, unsigned long old,
 			: "memory");
 		return result;
 	}
-#if (BITS_PER_LONG == 64)
+#if (CAA_BITS_PER_LONG == 64)
 	case 8:
 	{
 		unsigned long result = old;
@@ -155,7 +143,7 @@ unsigned long __uatomic_exchange(void *addr, unsigned long val, int len)
 			: "memory");
 		return result;
 	}
-#if (BITS_PER_LONG == 64)
+#if (CAA_BITS_PER_LONG == 64)
 	case 8:
 	{
 		unsigned long result;
@@ -218,7 +206,7 @@ unsigned long __uatomic_add_return(void *addr, unsigned long val,
 			: "memory");
 		return result + (unsigned int)val;
 	}
-#if (BITS_PER_LONG == 64)
+#if (CAA_BITS_PER_LONG == 64)
 	case 8:
 	{
 		unsigned long result = val;
@@ -276,7 +264,7 @@ void __uatomic_add(void *addr, unsigned long val, int len)
 			: "memory");
 		return;
 	}
-#if (BITS_PER_LONG == 64)
+#if (CAA_BITS_PER_LONG == 64)
 	case 8:
 	{
 		__asm__ __volatile__(
@@ -331,7 +319,7 @@ void __uatomic_inc(void *addr, int len)
 			: "memory");
 		return;
 	}
-#if (BITS_PER_LONG == 64)
+#if (CAA_BITS_PER_LONG == 64)
 	case 8:
 	{
 		__asm__ __volatile__(
@@ -384,7 +372,7 @@ void __uatomic_dec(void *addr, int len)
 			: "memory");
 		return;
 	}
-#if (BITS_PER_LONG == 64)
+#if (CAA_BITS_PER_LONG == 64)
 	case 8:
 	{
 		__asm__ __volatile__(
@@ -404,7 +392,7 @@ void __uatomic_dec(void *addr, int len)
 
 #define _uatomic_dec(addr)	(__uatomic_dec((addr), sizeof(*(addr))))
 
-#if ((BITS_PER_LONG != 64) && defined(CONFIG_RCU_COMPAT_ARCH))
+#if ((CAA_BITS_PER_LONG != 64) && defined(CONFIG_RCU_COMPAT_ARCH))
 extern int __rcu_cas_avail;
 extern int __rcu_cas_init(void);
 
@@ -440,8 +428,8 @@ extern unsigned long _compat_uatomic_cmpxchg(void *addr, unsigned long old,
 						(unsigned long)(_new), 	       \
 						sizeof(*(addr))))
 
-extern unsigned long _compat_uatomic_xchg(void *addr,
-					  unsigned long _new, int len);
+extern unsigned long _compat_uatomic_add_return(void *addr,
+						unsigned long _new, int len);
 #define compat_uatomic_add_return(addr, v)				       \
 	((__typeof__(*(addr))) _compat_uatomic_add_return((addr),	       \
 						(unsigned long)(v), 	       \