Rename all memory primitives with prefix cmm_

[urcu.git] / urcu-bp-static.h

diff --git a/urcu-bp-static.h b/urcu-bp-static.h
index 6d7e3c874cff4c60f869a15f368324b3b080efde..394476b232d5aff5e52aeb1c283627e1249c1f4a 100644 (file)
--- a/urcu-bp-static.h
+++ b/urcu-bp-static.h
@@ -175,7 +175,7 @@ static inline void _rcu_read_lock(void)
        if (unlikely(!rcu_reader))
                rcu_bp_register();
 
-       barrier();      /* Ensure the compiler does not reorder us with mutex */
+       cmm_barrier();  /* Ensure the compiler does not reorder us with mutex */
        tmp = rcu_reader->ctr;
        /*
         * rcu_gp_ctr is
@@ -187,7 +187,7 @@ static inline void _rcu_read_lock(void)
                 * Set active readers count for outermost nesting level before
                 * accessing the pointer.
                 */
-               smp_mb();
+               cmm_smp_mb();
        } else {
                _STORE_SHARED(rcu_reader->ctr, tmp + RCU_GP_COUNT);
        }
@@ -198,9 +198,9 @@ static inline void _rcu_read_unlock(void)
        /*
         * Finish using rcu before decrementing the pointer.
         */
-       smp_mb();
+       cmm_smp_mb();
        _STORE_SHARED(rcu_reader->ctr, rcu_reader->ctr - RCU_GP_COUNT);
-       barrier();      /* Ensure the compiler does not reorder us with mutex */
+       cmm_barrier();  /* Ensure the compiler does not reorder us with mutex */
 }
 
 #ifdef __cplusplus