Allow forcing the use of sys membarrier

[urcu.git] / include / urcu / static / urcu.h

diff --git a/include/urcu/static/urcu.h b/include/urcu/static/urcu.h
index 7048f9938a6eeb31a7a441ee762219e35d11fc4c..20fc864315e8a5a5a830a2c656401412e5f007f9 100644 (file)
--- 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>
@@ -89,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();