X-Git-Url: https://git.lttng.org/?p=urcu.git;a=blobdiff_plain;f=urcu%2Fstatic%2Furcu-bp.h;h=8d221637a2756890d718faf55d7ca0a5a4a5ac23;hp=832ba0fe2b238293558761fa94b3bbdd9ba05e14;hb=a0b7f7ea3fc3339a1c42caffd53ce9f056e5b901;hpb=de10a5858ea0638c9059bb3315794ccb1401f404

diff --git a/urcu/static/urcu-bp.h b/urcu/static/urcu-bp.h
index 832ba0f..8d22163 100644
--- a/urcu/static/urcu-bp.h
+++ b/urcu/static/urcu-bp.h
@@ -166,7 +166,7 @@ static inline void _rcu_read_lock(void)
 	long tmp;
 
 	/* Check if registered */
-	if (unlikely(!rcu_reader))
+	if (caa_unlikely(!rcu_reader))
 		rcu_bp_register();
 
 	cmm_barrier();	/* Ensure the compiler does not reorder us with mutex */
@@ -175,7 +175,7 @@ static inline void _rcu_read_lock(void)
 	 * rcu_gp_ctr is
 	 *   RCU_GP_COUNT | (~RCU_GP_CTR_PHASE or RCU_GP_CTR_PHASE)
 	 */
-	if (likely(!(tmp & RCU_GP_CTR_NEST_MASK))) {
+	if (caa_likely(!(tmp & RCU_GP_CTR_NEST_MASK))) {
 		_CMM_STORE_SHARED(rcu_reader->ctr, _CMM_LOAD_SHARED(rcu_gp_ctr));
 		/*
 		 * Set active readers count for outermost nesting level before