X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=include%2Furcu%2Fstatic%2Furcu.h;h=20fc864315e8a5a5a830a2c656401412e5f007f9;hp=9082af71a92c443dd0efe8be74d879c55dd56ddd;hb=d8d9a3405ce46af6d34d2e80e260ad50f3d211a0;hpb=6893800a4d1cc14dff0395ddcd660a5138db183d

diff --git a/include/urcu/static/urcu.h b/include/urcu/static/urcu.h
index 9082af7..20fc864 100644
--- a/include/urcu/static/urcu.h
+++ b/include/urcu/static/urcu.h
@@ -34,6 +34,7 @@
 #include <unistd.h>
 #include <stdint.h>
 
+#include <urcu/config.h>
 #include <urcu/compiler.h>
 #include <urcu/arch.h>
 #include <urcu/system.h>
@@ -41,7 +42,6 @@
 #include <urcu/list.h>
 #include <urcu/futex.h>
 #include <urcu/tls-compat.h>
-#include <urcu/rand-compat.h>
 #include <urcu/debug.h>
 
 #ifdef __cplusplus
@@ -90,11 +90,15 @@ enum rcu_state {
  */
 
 #ifdef RCU_MEMBARRIER
-extern int rcu_has_sys_membarrier;
+#ifdef CONFIG_RCU_FORCE_SYS_MEMBARRIER
+#define rcu_has_sys_membarrier_memb	1
+#else
+extern int rcu_has_sys_membarrier_memb;
+#endif
 
 static inline void smp_mb_slave(void)
 {
-	if (caa_likely(rcu_has_sys_membarrier))
+	if (caa_likely(rcu_has_sys_membarrier_memb))
 		cmm_barrier();
 	else
 		cmm_smp_mb();