From: Mathieu Desnoyers Date: Mon, 28 Nov 2011 14:02:16 +0000 (-0500) Subject: rculfhash: likely -> caa_likely fix X-Git-Tag: v0.7.0~43^2~32 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=4c299dcbef9ad69c2dfbb9b4537b77252fc76d0d;p=userspace-rcu.git rculfhash: likely -> caa_likely fix Signed-off-by: Mathieu Desnoyers --- diff --git a/rculfhash.c b/rculfhash.c index dd49c50..61dc09c 100644 --- a/rculfhash.c +++ b/rculfhash.c @@ -549,7 +549,7 @@ void ht_count_add(struct cds_lfht *ht, unsigned long size, unsigned long hash) dbg_printf("add split count %lu\n", split_count); count = uatomic_add_return(&ht->count, 1UL << COUNT_COMMIT_ORDER); - if (likely(count & (count - 1))) + if (caa_likely(count & (count - 1))) return; /* Only if global count is power of 2 */ @@ -578,7 +578,7 @@ void ht_count_del(struct cds_lfht *ht, unsigned long size, unsigned long hash) dbg_printf("del split count %lu\n", split_count); count = uatomic_add_return(&ht->count, -(1UL << COUNT_COMMIT_ORDER)); - if (likely(count & (count - 1))) + if (caa_likely(count & (count - 1))) return; /* Only if global count is power of 2 */