X-Git-Url: https://git.lttng.org/?p=urcu.git;a=blobdiff_plain;f=urcu-qsbr-static.h;h=0d73bcfe91b8ed7f581a2f73e37eb152da0aea5e;hp=87305cb694a9bcc4e175f37829736fcdb81d9686;hb=ec4e58a3aba2084440012f8ccac3a31eb6101183;hpb=2f873279bc92fac32e6549d6eb72f3197c7048ac

diff --git a/urcu-qsbr-static.h b/urcu-qsbr-static.h
index 87305cb..0d73bcf 100644
--- a/urcu-qsbr-static.h
+++ b/urcu-qsbr-static.h
@@ -36,8 +36,8 @@
 #include <syscall.h>
 #include <unistd.h>
 
-#include <compiler.h>
-#include <arch.h>
+#include <urcu/compiler.h>
+#include <urcu/arch.h>
 
 /*
  * Identify a shared load. A smp_rmc() or smp_mc() should come before the load.
@@ -191,8 +191,8 @@ extern int gp_futex;
  */
 static inline void wake_up_gp(void)
 {
-	if (unlikely(atomic_read(&gp_futex) == -1)) {
-		atomic_set(&gp_futex, 0);
+	if (unlikely(uatomic_read(&gp_futex) == -1)) {
+		uatomic_set(&gp_futex, 0);
 		futex(&gp_futex, FUTEX_WAKE, 1,
 		      NULL, NULL, 0);
 	}
@@ -286,7 +286,7 @@ static inline void _rcu_thread_online(void)
 		if (!__builtin_constant_p(_new) ||	\
 		    ((_new) != NULL))			\
 			wmb();				\
-		cmpxchg(p, old, _new);			\
+		uatomic_cmpxchg(p, old, _new);		\
 	})
 
 /**
@@ -300,7 +300,7 @@ static inline void _rcu_thread_online(void)
 		if (!__builtin_constant_p(v) ||		\
 		    ((v) != NULL))			\
 			wmb();				\
-		xchg(p, v);				\
+		uatomic_xchg(p, v);			\
 	})
 
 /*