X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;ds=sidebyside;f=urcu-static.h;h=ad415ac7e86d5c686dc49ddb3f464ad8a24f8178;hb=5481ddb381061bda64aebc039900d21cac6a6caf;hp=56c853d57c440d49e7559b76a4f178bbcfa959d6;hpb=6982d6d71aeed16d2d929bd0ed221e8f444b706e;p=urcu.git

diff --git a/urcu-static.h b/urcu-static.h
index 56c853d..ad415ac 100644
--- 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,9 +295,10 @@ 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 
+#ifdef __cplusplus
 }
 #endif