Rename all memory primitives with prefix cmm_

[urcu.git] / urcu-static.h

diff --git a/urcu-static.h b/urcu-static.h
index dce15b7122cad8c3c44c3d7881cf97b81c92fb3e..ad415ac7e86d5c686dc49ddb3f464ad8a24f8178 100644 (file)
--- a/urcu-static.h
+++ b/urcu-static.h
@@ -181,23 +181,23 @@ extern int has_sys_membarrier;
 static inline void smp_mb_slave(int group)
 {
        if (likely(has_sys_membarrier))
-               barrier();
+               cmm_barrier();
        else
-               smp_mb();
+               cmm_smp_mb();
 }
 #endif
 
 #ifdef RCU_MB
 static inline void smp_mb_slave(int group)
 {
-       smp_mb();
+       cmm_smp_mb();
 }
 #endif
 
 #ifdef RCU_SIGNAL
 static inline void smp_mb_slave(int group)
 {
-       barrier();
+       cmm_barrier();
 }
 #endif
 
@@ -259,6 +259,7 @@ static inline void _rcu_read_lock(void)
 {
        unsigned long tmp;
 
+       cmm_barrier();  /* Ensure the compiler does not reorder us with mutex */
        tmp = rcu_reader.ctr;
        /*
         * rcu_gp_ctr is
@@ -294,6 +295,7 @@ static inline void _rcu_read_unlock(void)
        } else {
                _STORE_SHARED(rcu_reader.ctr, rcu_reader.ctr - RCU_GP_COUNT);
        }
+       cmm_barrier();  /* Ensure the compiler does not reorder us with mutex */
 }
 
 #ifdef __cplusplus