X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Flinux%2Fbitmap.h;h=cff80436fcb78aa87d5af90748b05fcc0c0c15e3;hb=9464c7cf61b9433057924c36e6e02f303a00e768;hp=a1460b5fc7b126055dffbdbb84cfa44eb32b86c5;hpb=41689045f6a3cbe0550e1d34e9cc20d2e8c432ba;p=linux-2.6.git

diff --git a/include/linux/bitmap.h b/include/linux/bitmap.h
index a1460b5fc..cff80436f 100644
--- a/include/linux/bitmap.h
+++ b/include/linux/bitmap.h
@@ -24,9 +24,6 @@
  * The available bitmap operations and their rough meaning in the
  * case that the bitmap is a single unsigned long are thus:
  *
- * Note that nbits should be always a compile time evaluable constant.
- * Otherwise many inlines will generate horrible code.
- *
  * bitmap_zero(dst, nbits)			*dst = 0UL
  * bitmap_fill(dst, nbits)			*dst = ~0UL
  * bitmap_copy(dst, src, nbits)			*dst = *src
@@ -247,8 +244,6 @@ static inline int __must_check bitmap_full(const unsigned long *src, int nbits)
 
 static inline int __must_check bitmap_weight(const unsigned long *src, int nbits)
 {
-	if (nbits <= BITS_PER_LONG)
-		return hweight_long(*src & BITMAP_LAST_WORD_MASK(nbits));
 	return __bitmap_weight(src, nbits);
 }