2 files changed, 12 insertions, 11 deletions

diff --git a/include/linux/bitmap.h b/include/linux/bitmap.h
index c168a807ab9a..5e7f75a6d7d0 100644
--- a/include/linux/bitmap.h
+++ b/include/linux/bitmap.h
@@ -98,8 +98,8 @@ extern void __bitmap_complement(unsigned long *dst, const unsigned long *src,
                         unsigned int nbits);
 extern void __bitmap_shift_right(unsigned long *dst, const unsigned long *src,
                                 unsigned int shift, unsigned int nbits);
-extern void __bitmap_shift_left(unsigned long *dst,
-                        const unsigned long *src, int shift, int bits);
+extern void __bitmap_shift_left(unsigned long *dst, const unsigned long *src,
+                                unsigned int shift, unsigned int nbits);
 extern int __bitmap_and(unsigned long *dst, const unsigned long *bitmap1,
                         const unsigned long *bitmap2, unsigned int nbits);
 extern void __bitmap_or(unsigned long *dst, const unsigned long *bitmap1,
@@ -322,13 +322,13 @@ static inline void bitmap_shift_right(unsigned long *dst, const unsigned long *s
                 __bitmap_shift_right(dst, src, shift, nbits);
 }
 
-static inline void bitmap_shift_left(unsigned long *dst,
-                        const unsigned long *src, int n, int nbits)
+static inline void bitmap_shift_left(unsigned long *dst, const unsigned long *src,
+                                unsigned int shift, unsigned int nbits)
 {
         if (small_const_nbits(nbits))
-                *dst = (*src << n) & BITMAP_LAST_WORD_MASK(nbits);
+                *dst = (*src << shift) & BITMAP_LAST_WORD_MASK(nbits);
         else
-                __bitmap_shift_left(dst, src, n, nbits);
+                __bitmap_shift_left(dst, src, shift, nbits);
 }
 
 static inline int bitmap_parse(const char *buf, unsigned int buflen,
diff --git a/lib/bitmap.c b/lib/bitmap.c
index db88512c3451..74bdf3601245 100644
--- a/lib/bitmap.c
+++ b/lib/bitmap.c
@@ -148,18 +148,19 @@ EXPORT_SYMBOL(__bitmap_shift_right);
  *   @dst : destination bitmap
  *   @src : source bitmap
  *   @shift : shift by this many bits
- *   @bits : bitmap size, in bits
+ *   @nbits : bitmap size, in bits
  *
  * Shifting left (multiplying) means moving bits in the LS -> MS
  * direction.  Zeros are fed into the vacated LS bit positions
  * and those MS bits shifted off the top are lost.
  */
 
-void __bitmap_shift_left(unsigned long *dst,
-                        const unsigned long *src, int shift, int bits)
+void __bitmap_shift_left(unsigned long *dst, const unsigned long *src,
+                        unsigned int shift, unsigned int nbits)
 {
-        int k, lim = BITS_TO_LONGS(bits), left = bits % BITS_PER_LONG;
-        int off = shift/BITS_PER_LONG, rem = shift % BITS_PER_LONG;
+        int k;
+        unsigned int lim = BITS_TO_LONGS(nbits), left = nbits % BITS_PER_LONG;
+        unsigned int off = shift/BITS_PER_LONG, rem = shift % BITS_PER_LONG;
         for (k = lim - off - 1; k >= 0; --k) {
                 unsigned long upper, lower;