No functional change.
Signed-off-by: Andrew Cooper <[email protected]>
Reviewed-by: Jan Beulich <[email protected]>
---
CC: Jan Beulich <[email protected]>
CC: Roger Pau Monné <[email protected]>
CC: Stefano Stabellini <[email protected]>
CC: Julien Grall <[email protected]>
CC: Volodymyr Babchuk <[email protected]>
CC: Bertrand Marquis <[email protected]>
CC: Michal Orzel <[email protected]>
CC: Oleksii Kurochko <[email protected]>
CC: Shawn Anastasio <[email protected]>
---
xen/common/bitmap.c | 4 ++--
xen/include/xen/bitops.h | 5 -----
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/xen/common/bitmap.c b/xen/common/bitmap.c
index 9d9ff09f3dde..3da63a32a680 100644
--- a/xen/common/bitmap.c
+++ b/xen/common/bitmap.c
@@ -191,10 +191,10 @@ unsigned int __bitmap_weight(const unsigned long *bitmap,
unsigned int bits)
unsigned int k, w = 0, lim = bits / BITS_PER_LONG;
for (k = 0; k < lim; k++)
- w += hweight_long(bitmap[k]);
+ w += hweightl(bitmap[k]);
if (bits % BITS_PER_LONG)
- w += hweight_long(bitmap[k] & BITMAP_LAST_WORD_MASK(bits));
+ w += hweightl(bitmap[k] & BITMAP_LAST_WORD_MASK(bits));
return w;
}
diff --git a/xen/include/xen/bitops.h b/xen/include/xen/bitops.h
index 96dfe0f2c71a..58c600155f7e 100644
--- a/xen/include/xen/bitops.h
+++ b/xen/include/xen/bitops.h
@@ -431,11 +431,6 @@ static inline unsigned int generic_hweight64(uint64_t w)
return (w + (w >> 32)) & 0xFF;
}
-static inline unsigned int hweight_long(unsigned long w)
-{
- return sizeof(w) == 4 ? generic_hweight32(w) : generic_hweight64(w);
-}
-
/*
* rol32 - rotate a 32-bit value left
*
--
2.39.2
