Change the nbits parameter of bitmap_onto to unsigned int for
consistency with other bitmap_* functions.

Signed-off-by: Rasmus Villemoes <[email protected]>
---
 include/linux/bitmap.h | 2 +-
 lib/bitmap.c           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/linux/bitmap.h b/include/linux/bitmap.h
index 0106f02e5a93..bf29a08bb3db 100644
--- a/include/linux/bitmap.h
+++ b/include/linux/bitmap.h
@@ -137,7 +137,7 @@ extern void bitmap_remap(unsigned long *dst, const unsigned 
long *src,
 extern int bitmap_bitremap(int oldbit,
                const unsigned long *old, const unsigned long *new, int bits);
 extern void bitmap_onto(unsigned long *dst, const unsigned long *orig,
-               const unsigned long *relmap, int bits);
+               const unsigned long *relmap, unsigned int bits);
 extern void bitmap_fold(unsigned long *dst, const unsigned long *orig,
                int sz, int bits);
 extern int bitmap_find_free_region(unsigned long *bitmap, unsigned int bits, 
int order);
diff --git a/lib/bitmap.c b/lib/bitmap.c
index b499ab6ada29..42d5886c3680 100644
--- a/lib/bitmap.c
+++ b/lib/bitmap.c
@@ -975,9 +975,9 @@ EXPORT_SYMBOL(bitmap_bitremap);
  * All bits in @dst not set by the above rule are cleared.
  */
 void bitmap_onto(unsigned long *dst, const unsigned long *orig,
-                       const unsigned long *relmap, int bits)
+                       const unsigned long *relmap, unsigned int bits)
 {
-       int n, m;               /* same meaning as in above comment */
+       unsigned int n, m;              /* same meaning as in above comment */
 
        if (dst == orig)        /* following doesn't handle inplace mappings */
                return;
-- 
2.1.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to