X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu-qsbr.c;h=607e6aee1f44adbb48d8f569e2be26b414d6c93c;hp=b7c42fdb0c35deb37e8c5d76a4593746206df0d9;hb=b39e1761c4ccb070fcda1b86dc4ff0c66a853299;hpb=7e030b2b23c2bcbd3270a4b6c2a78c55cd49979f

diff --git a/urcu-qsbr.c b/urcu-qsbr.c
index b7c42fd..607e6ae 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) */
+#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) */
+#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;
@@ -241,7 +241,7 @@ out:
 		_CAA_STORE_SHARED(rcu_reader.ctr, CAA_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;
@@ -268,7 +268,7 @@ out:
 		_CAA_STORE_SHARED(rcu_reader.ctr, CAA_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.