diff --git a/tools/include/linux/bitmap.h b/tools/include/linux/bitmap.h
index 3aeeb60f1988231d36bd6afbf5d4dee841cdc654..3517972c259ed972d77a6b5fb7a64342ffd99dbb 100644
--- a/tools/include/linux/bitmap.h
+++ b/tools/include/linux/bitmap.h
@@ -27,14 +27,14 @@ int __bitmap_and(unsigned long *dst, const unsigned long *bitmap1,
 #define small_const_nbits(nbits) \
 	(__builtin_constant_p(nbits) && (nbits) <= BITS_PER_LONG)
 
-#define bitmap_size(nbits)	(ALIGN(nbits, BITS_PER_LONG) / BITS_PER_BYTE)
-
 static inline void bitmap_zero(unsigned long *dst, int nbits)
 {
 	if (small_const_nbits(nbits))
 		*dst = 0UL;
 	else {
-		memset(dst, 0, bitmap_size(nbits));
+		int len = BITS_TO_LONGS(nbits) * sizeof(unsigned long);
+
+		memset(dst, 0, len);
 	}
 }
 
@@ -120,7 +120,7 @@ static inline int test_and_clear_bit(int nr, unsigned long *addr)
  */
 static inline unsigned long *bitmap_alloc(int nbits)
 {
-	return calloc(1, bitmap_size(nbits));
+	return calloc(1, BITS_TO_LONGS(nbits) * sizeof(unsigned long));
 }
 
 /*