From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53745) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WryKl-0008A5-Jk for qemu-devel@nongnu.org; Tue, 03 Jun 2014 19:41:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WryKk-0006gW-IY for qemu-devel@nongnu.org; Tue, 03 Jun 2014 19:41:35 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:48353) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WryKk-0006g9-Bs for qemu-devel@nongnu.org; Tue, 03 Jun 2014 19:41:34 -0400 From: Peter Maydell Date: Wed, 4 Jun 2014 00:41:32 +0100 Message-Id: <1401838892-2073-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH] util/hbitmap.c: Use ctpopl rather than reimplementing a local equivalent List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Martin Husemann , patches@linaro.org The function popcountl() in hbitmap.c is effectively a reimplementation of what host-utils.h provides as ctpopl(). Use ctpopl() directly; this fixes a failure to compile on NetBSD (whose strings.h erroneously exposes a system popcountl() which clashes with this one). Signed-off-by: Peter Maydell Reported-by: Martin Husemann --- We haven't compiled on NetBSD for over a year... util/hbitmap.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/util/hbitmap.c b/util/hbitmap.c index d936831..b3060e6 100644 --- a/util/hbitmap.c +++ b/util/hbitmap.c @@ -92,11 +92,6 @@ struct HBitmap { unsigned long *levels[HBITMAP_LEVELS]; }; -static inline int popcountl(unsigned long l) -{ - return BITS_PER_LONG == 32 ? ctpop32(l) : ctpop64(l); -} - /* Advance hbi to the next nonzero word and return it. hbi->pos * is updated. Returns zero if we reach the end of the bitmap. */ @@ -200,14 +195,14 @@ static uint64_t hb_count_between(HBitmap *hb, uint64_t start, uint64_t last) if (pos >= (end >> BITS_PER_LEVEL)) { break; } - count += popcountl(cur); + count += ctpopl(cur); } if (pos == (end >> BITS_PER_LEVEL)) { /* Drop bits representing the END-th and subsequent items. */ int bit = end & (BITS_PER_LONG - 1); cur &= (1UL << bit) - 1; - count += popcountl(cur); + count += ctpopl(cur); } return count; -- 1.9.2