X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=urcu-bp.c;h=db2aef0c57b8ef397095cd71d6c12ded119bb9ec;hb=47c5a84f6137e1cb2fcbf448a134a0485d6f102e;hp=136f97d3cf6746eef6d39a9f2a22ca1139a342fc;hpb=16aa9ee87cf4364921c36025359be01390338d87;p=urcu.git

diff --git a/urcu-bp.c b/urcu-bp.c
index 136f97d..db2aef0 100644
--- a/urcu-bp.c
+++ b/urcu-bp.c
@@ -95,11 +95,6 @@ static void mutex_lock(pthread_mutex_t *mutex)
 			perror("Error in pthread mutex lock");
 			exit(-1);
 		}
-		if (rcu_reader.need_mb) {
-			cmm_smp_mb();
-			rcu_reader.need_mb = 0;
-			cmm_smp_mb();
-		}
 		poll(NULL,0,10);
 	}
 #endif /* #else #ifndef DISTRUST_SIGNALS_EXTREME */
@@ -123,13 +118,13 @@ void update_counter_and_wait(void)
 	struct rcu_reader *index, *tmp;
 
 	/* Switch parity: 0 -> 1, 1 -> 0 */
-	CAA_STORE_SHARED(rcu_gp_ctr, rcu_gp_ctr ^ RCU_GP_CTR_PHASE);
+	CMM_STORE_SHARED(rcu_gp_ctr, rcu_gp_ctr ^ RCU_GP_CTR_PHASE);
 
 	/*
 	 * Must commit qparity update to memory before waiting for other parity
 	 * quiescent state. Failure to do so could result in the writer waiting
 	 * forever while new readers are always accessing data (no progress).
-	 * Ensured by CAA_STORE_SHARED and CAA_LOAD_SHARED.
+	 * Ensured by CMM_STORE_SHARED and CMM_LOAD_SHARED.
 	 */
 
 	/*