Compat futex

[urcu.git] / urcu-pointer.c

diff --git a/urcu-pointer.c b/urcu-pointer.c
index 1461c60f367b032276db9b301bf57e93488a063b..83f0ffdacb388cdc87016a9a10408fe7b712e62d 100644 (file)
--- a/urcu-pointer.c
+++ b/urcu-pointer.c
@@ -24,13 +24,15 @@
  * IBM's contributions to this file may be relicensed under LGPLv2 or later.
  */
 
+#include <urcu/uatomic_arch.h>
+
 #include "urcu-pointer-static.h"
 /* Do not #define _LGPL_SOURCE to ensure we can emit the wrapper symbols */
 #include "urcu-pointer.h"
 
 extern void synchronize_rcu(void);
 
-void *rcu_dereference(void *p)
+void *rcu_dereference_sym(void *p)
 {
        return _rcu_dereference(p);
 }
@@ -50,14 +52,9 @@ void *rcu_xchg_pointer_sym(void **p, void *v)
 void *rcu_cmpxchg_pointer_sym(void **p, void *old, void *_new)
 {
        wmb();
-       return uatomic_cmpxchg(p, old, _new);
-}
-
-void *rcu_publish_content_sym(void **p, void *v)
-{
-       void *oldptr;
+       if (likely(URCU_CAS_AVAIL()))
+               return uatomic_cmpxchg(p, old, _new);
 
-       oldptr = _rcu_xchg_pointer(p, v);
-       synchronize_rcu();
-       return oldptr;
+       /* Compatibility for i386. Old-timer. */
+       return compat_uatomic_cmpxchg(p, old, _new);
 }