Merge branch 'apei-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb...

[firefly-linux-kernel-4.4.55.git] / lib / bitmap.c

diff --git a/lib/bitmap.c b/lib/bitmap.c
index 3f3b68199d744bd4fc9b94dcb9ca6e831502b0f2..2f4412e4d0719c25ca1d4948d489eee8c998f444 100644 (file)
--- a/lib/bitmap.c
+++ b/lib/bitmap.c
@@ -271,8 +271,6 @@ int __bitmap_weight(const unsigned long *bitmap, int bits)
 }
 EXPORT_SYMBOL(__bitmap_weight);
 
-#define BITMAP_FIRST_WORD_MASK(start) (~0UL << ((start) % BITS_PER_LONG))
-
 void bitmap_set(unsigned long *map, int start, int nr)
 {
        unsigned long *p = map + BIT_WORD(start);
@@ -756,7 +754,7 @@ static int bitmap_pos_to_ord(const unsigned long *buf, int pos, int bits)
  *
  * The bit positions 0 through @bits are valid positions in @buf.
  */
-static int bitmap_ord_to_pos(const unsigned long *buf, int ord, int bits)
+int bitmap_ord_to_pos(const unsigned long *buf, int ord, int bits)
 {
        int pos = 0;