X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=urcu-qsbr.c;h=69effd5ad8b52e3be4ee263ede2cafe81816f38b;hb=7106ddf86905188b9e92ee7000165c1af22f793e;hp=b7c42fdb0c35deb37e8c5d76a4593746206df0d9;hpb=16aa9ee87cf4364921c36025359be01390338d87;p=urcu.git

diff --git a/urcu-qsbr.c b/urcu-qsbr.c
index b7c42fd..69effd5 100644
--- a/urcu-qsbr.c
+++ b/urcu-qsbr.c
@@ -112,13 +112,13 @@ static void update_counter_and_wait(void)
 	int wait_loops = 0;
 	struct rcu_reader *index, *tmp;
 
-#if (BITS_PER_LONG < 64)
+#if (CAA_BITS_PER_LONG < 64)
 	/* Switch parity: 0 -> 1, 1 -> 0 */
-	CAA_STORE_SHARED(rcu_gp_ctr, rcu_gp_ctr ^ RCU_GP_CTR);
-#else	/* !(BITS_PER_LONG < 64) */
+	CMM_STORE_SHARED(rcu_gp_ctr, rcu_gp_ctr ^ RCU_GP_CTR);
+#else	/* !(CAA_BITS_PER_LONG < 64) */
 	/* Increment current G.P. */
-	CAA_STORE_SHARED(rcu_gp_ctr, rcu_gp_ctr + RCU_GP_CTR);
-#endif	/* !(BITS_PER_LONG < 64) */
+	CMM_STORE_SHARED(rcu_gp_ctr, rcu_gp_ctr + RCU_GP_CTR);
+#endif	/* !(CAA_BITS_PER_LONG < 64) */
 
 	/*
 	 * Must commit rcu_gp_ctr update to memory before waiting for quiescent
@@ -179,7 +179,7 @@ static void update_counter_and_wait(void)
  * long-size to ensure we do not encounter an overflow bug.
  */
 
-#if (BITS_PER_LONG < 64)
+#if (CAA_BITS_PER_LONG < 64)
 void synchronize_rcu(void)
 {
 	unsigned long was_online;
@@ -198,7 +198,7 @@ void synchronize_rcu(void)
 	 * threads registered as readers.
 	 */
 	if (was_online)
-		CAA_STORE_SHARED(rcu_reader.ctr, 0);
+		CMM_STORE_SHARED(rcu_reader.ctr, 0);
 
 	mutex_lock(&rcu_gp_lock);
 
@@ -238,10 +238,10 @@ out:
 	 * freed.
 	 */
 	if (was_online)
-		_CAA_STORE_SHARED(rcu_reader.ctr, CAA_LOAD_SHARED(rcu_gp_ctr));
+		_CMM_STORE_SHARED(rcu_reader.ctr, CMM_LOAD_SHARED(rcu_gp_ctr));
 	cmm_smp_mb();
 }
-#else /* !(BITS_PER_LONG < 64) */
+#else /* !(CAA_BITS_PER_LONG < 64) */
 void synchronize_rcu(void)
 {
 	unsigned long was_online;
@@ -255,7 +255,7 @@ void synchronize_rcu(void)
 	 */
 	cmm_smp_mb();
 	if (was_online)
-		CAA_STORE_SHARED(rcu_reader.ctr, 0);
+		CMM_STORE_SHARED(rcu_reader.ctr, 0);
 
 	mutex_lock(&rcu_gp_lock);
 	if (cds_list_empty(&registry))
@@ -265,10 +265,10 @@ out:
 	mutex_unlock(&rcu_gp_lock);
 
 	if (was_online)
-		_CAA_STORE_SHARED(rcu_reader.ctr, CAA_LOAD_SHARED(rcu_gp_ctr));
+		_CMM_STORE_SHARED(rcu_reader.ctr, CMM_LOAD_SHARED(rcu_gp_ctr));
 	cmm_smp_mb();
 }
-#endif  /* !(BITS_PER_LONG < 64) */
+#endif  /* !(CAA_BITS_PER_LONG < 64) */
 
 /*
  * library wrappers to be used by non-LGPL compatible source code.