From 4c299dcbef9ad69c2dfbb9b4537b77252fc76d0d Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Mon, 28 Nov 2011 09:02:16 -0500 Subject: [PATCH] rculfhash: likely -> caa_likely fix Signed-off-by: Mathieu Desnoyers --- rculfhash.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 */ -- 2.34.1