linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / linux / bitmap.h

diff --git a/include/linux/bitmap.h b/include/linux/bitmap.h
index a1460b5..7d8ff97 100644 (file)
--- 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
@@ -49,9 +46,6 @@
  * bitmap_parse(ubuf, ulen, dst, nbits)                Parse bitmap dst from user buf
  * bitmap_scnlistprintf(buf, len, src, nbits)  Print bitmap src as list to buf
  * bitmap_parselist(buf, dst, nbits)           Parse bitmap dst from list
- * bitmap_find_free_region(bitmap, bits, order)        Find and allocate bit region
- * bitmap_release_region(bitmap, pos, order)   Free specified bit region
- * bitmap_allocate_region(bitmap, pos, order)  Allocate specified bit region
  */
 
 /*
@@ -202,7 +196,7 @@ static inline void bitmap_complement(unsigned long *dst, const unsigned long *sr
                __bitmap_complement(dst, src, nbits);
 }
 
-static inline int __must_check bitmap_equal(const unsigned long *src1,
+static inline int bitmap_equal(const unsigned long *src1,
                        const unsigned long *src2, int nbits)
 {
        if (nbits <= BITS_PER_LONG)
@@ -211,7 +205,7 @@ static inline int __must_check bitmap_equal(const unsigned long *src1,
                return __bitmap_equal(src1, src2, nbits);
 }
 
-static inline int __must_check bitmap_intersects(const unsigned long *src1,
+static inline int bitmap_intersects(const unsigned long *src1,
                        const unsigned long *src2, int nbits)
 {
        if (nbits <= BITS_PER_LONG)
@@ -220,7 +214,7 @@ static inline int __must_check bitmap_intersects(const unsigned long *src1,
                return __bitmap_intersects(src1, src2, nbits);
 }
 
-static inline int __must_check bitmap_subset(const unsigned long *src1,
+static inline int bitmap_subset(const unsigned long *src1,
                        const unsigned long *src2, int nbits)
 {
        if (nbits <= BITS_PER_LONG)
@@ -229,7 +223,7 @@ static inline int __must_check bitmap_subset(const unsigned long *src1,
                return __bitmap_subset(src1, src2, nbits);
 }
 
-static inline int __must_check bitmap_empty(const unsigned long *src, int nbits)
+static inline int bitmap_empty(const unsigned long *src, int nbits)
 {
        if (nbits <= BITS_PER_LONG)
                return ! (*src & BITMAP_LAST_WORD_MASK(nbits));
@@ -237,7 +231,7 @@ static inline int __must_check bitmap_empty(const unsigned long *src, int nbits)
                return __bitmap_empty(src, nbits);
 }
 
-static inline int __must_check bitmap_full(const unsigned long *src, int nbits)
+static inline int bitmap_full(const unsigned long *src, int nbits)
 {
        if (nbits <= BITS_PER_LONG)
                return ! (~(*src) & BITMAP_LAST_WORD_MASK(nbits));
@@ -245,10 +239,8 @@ static inline int __must_check bitmap_full(const unsigned long *src, int nbits)
                return __bitmap_full(src, nbits);
 }
 
-static inline int __must_check bitmap_weight(const unsigned long *src, int nbits)
+static inline int 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);
 }