X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu-pointer.c;h=61e35da5d718a05dc0f8fad69b0aeb370c7c1d66;hp=f5c98118499d5706b1b13458a83f6bb4a044adfb;hb=92af1a30ca6a70945b167c31631c8598a626c71a;hpb=6982d6d71aeed16d2d929bd0ed221e8f444b706e

diff --git a/urcu-pointer.c b/urcu-pointer.c
index f5c9811..61e35da 100644
--- a/urcu-pointer.c
+++ b/urcu-pointer.c
@@ -24,9 +24,9 @@
  * IBM's contributions to this file may be relicensed under LGPLv2 or later.
  */
 
-#include <urcu/uatomic_arch.h>
+#include <urcu/uatomic.h>
 
-#include "urcu-pointer-static.h"
+#include "urcu/static/urcu-pointer.h"
 /* Do not #define _LGPL_SOURCE to ensure we can emit the wrapper symbols */
 #include "urcu-pointer.h"
 
@@ -39,18 +39,19 @@ void *rcu_dereference_sym(void *p)
 
 void *rcu_set_pointer_sym(void **p, void *v)
 {
-	wmb();
-	return uatomic_set(p, v);
+	cmm_wmb();
+	uatomic_set(p, v);
+	return v;
 }
 
 void *rcu_xchg_pointer_sym(void **p, void *v)
 {
-	wmb();
+	cmm_wmb();
 	return uatomic_xchg(p, v);
 }
 
 void *rcu_cmpxchg_pointer_sym(void **p, void *old, void *_new)
 {
-	wmb();
+	cmm_wmb();
 	return uatomic_cmpxchg(p, old, _new);
 }