X-Git-Url: https://git.lttng.org/?p=urcu.git;a=blobdiff_plain;f=urcu-qsbr-static.h;h=108ef6e7181d58409b2314d0ea0551b211f8e76a;hp=041361799b89694b8f9e8c9f7af0d142d040a44e;hb=5481ddb381061bda64aebc039900d21cac6a6caf;hpb=6982d6d71aeed16d2d929bd0ed221e8f444b706e

diff --git a/urcu-qsbr-static.h b/urcu-qsbr-static.h
index 0413617..108ef6e 100644
--- a/urcu-qsbr-static.h
+++ b/urcu-qsbr-static.h
@@ -174,25 +174,27 @@ static inline void _rcu_read_unlock(void)
 
 static inline void _rcu_quiescent_state(void)
 {
-	smp_mb();	
+	cmm_smp_mb();
 	_STORE_SHARED(rcu_reader.ctr, _LOAD_SHARED(rcu_gp_ctr));
-	smp_mb();	/* write rcu_reader.ctr before read futex */
+	cmm_smp_mb();	/* write rcu_reader.ctr before read futex */
 	wake_up_gp();
-	smp_mb();
+	cmm_smp_mb();
 }
 
 static inline void _rcu_thread_offline(void)
 {
-	smp_mb();
+	cmm_smp_mb();
 	STORE_SHARED(rcu_reader.ctr, 0);
-	smp_mb();	/* write rcu_reader.ctr before read futex */
+	cmm_smp_mb();	/* write rcu_reader.ctr before read futex */
 	wake_up_gp();
+	cmm_barrier();	/* Ensure the compiler does not reorder us with mutex */
 }
 
 static inline void _rcu_thread_online(void)
 {
+	cmm_barrier();	/* Ensure the compiler does not reorder us with mutex */
 	_STORE_SHARED(rcu_reader.ctr, LOAD_SHARED(rcu_gp_ctr));
-	smp_mb();
+	cmm_smp_mb();
 }
 
 #ifdef __cplusplus