X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=urcu%2Fuatomic%2Fx86.h;h=9b67f1608d365830bd951382781ada35f91b6150;hb=cc6b0c208a9707f8a64609a51167290caeace288;hp=b4c108fb2c4e43b4f20c3b24cda20563b0059958;hpb=a2e7bf9ce5de5113c7f59c380b0087e291cd603d;p=urcu.git

diff --git a/urcu/uatomic/x86.h b/urcu/uatomic/x86.h
index b4c108f..9b67f16 100644
--- a/urcu/uatomic/x86.h
+++ b/urcu/uatomic/x86.h
@@ -505,9 +505,9 @@ extern int __rcu_cas_avail;
 extern int __rcu_cas_init(void);
 
 #define UATOMIC_COMPAT(insn)							\
-	((likely(__rcu_cas_avail > 0))						\
+	((caa_likely(__rcu_cas_avail > 0))						\
 	? (_uatomic_##insn)							\
-		: ((unlikely(__rcu_cas_avail < 0)				\
+		: ((caa_unlikely(__rcu_cas_avail < 0)				\
 			? ((__rcu_cas_init() > 0)				\
 				? (_uatomic_##insn)				\
 				: (compat_uatomic_##insn))			\
@@ -536,26 +536,24 @@ extern unsigned long _compat_uatomic_cmpxchg(void *addr, unsigned long old,
 						(unsigned long)(_new), 	       \
 						sizeof(*(addr))))
 
-extern unsigned long _compat_uatomic_and(void *addr,
-				         unsigned long _new, int len);
+extern void _compat_uatomic_and(void *addr, unsigned long _new, int len);
 #define compat_uatomic_and(addr, v)				       \
-	((__typeof__(*(addr))) _compat_uatomic_and((addr),	       \
-						   (unsigned long)(v), \
-						   sizeof(*(addr))))
+	(_compat_uatomic_and((addr),				       \
+			(unsigned long)(v),			       \
+			sizeof(*(addr))))
 
-extern unsigned long _compat_uatomic_or(void *addr,
-				        unsigned long _new, int len);
+extern void _compat_uatomic_or(void *addr, unsigned long _new, int len);
 #define compat_uatomic_or(addr, v)				       \
-	((__typeof__(*(addr))) _compat_uatomic_or((addr),	       \
-						  (unsigned long)(v),  \
-						  sizeof(*(addr))))
+	(_compat_uatomic_or((addr),				       \
+			  (unsigned long)(v),			       \
+			  sizeof(*(addr))))
 
 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), 	       \
-						sizeof(*(addr))))
+#define compat_uatomic_add_return(addr, v)			       \
+	((__typeof__(*(addr))) _compat_uatomic_add_return((addr),      \
+						   (unsigned long)(v), \
+						   sizeof(*(addr))))
 
 #define compat_uatomic_add(addr, v)					       \
 		((void)compat_uatomic_add_return((addr), (v)))