X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=urcu-bp-static.h;h=394476b232d5aff5e52aeb1c283627e1249c1f4a;hb=5481ddb381061bda64aebc039900d21cac6a6caf;hp=515be288d6b75011a1428994343d641e2cf9f330;hpb=6982d6d71aeed16d2d929bd0ed221e8f444b706e;p=userspace-rcu.git

diff --git a/urcu-bp-static.h b/urcu-bp-static.h
index 515be28..394476b 100644
--- a/urcu-bp-static.h
+++ b/urcu-bp-static.h
@@ -175,6 +175,7 @@ static inline void _rcu_read_lock(void)
 	if (unlikely(!rcu_reader))
 		rcu_bp_register();
 
+	cmm_barrier();	/* Ensure the compiler does not reorder us with mutex */
 	tmp = rcu_reader->ctr;
 	/*
 	 * rcu_gp_ctr is
@@ -186,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);
 	}
@@ -197,8 +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);
+	cmm_barrier();	/* Ensure the compiler does not reorder us with mutex */
 }
 
 #ifdef __cplusplus