aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/bitmap.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux/bitmap.h')
-rw-r--r--include/linux/bitmap.h12
1 files changed, 6 insertions, 6 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,
98 unsigned int nbits); 98 unsigned int nbits);
99extern void __bitmap_shift_right(unsigned long *dst, const unsigned long *src, 99extern void __bitmap_shift_right(unsigned long *dst, const unsigned long *src,
100 unsigned int shift, unsigned int nbits); 100 unsigned int shift, unsigned int nbits);
101extern void __bitmap_shift_left(unsigned long *dst, 101extern void __bitmap_shift_left(unsigned long *dst, const unsigned long *src,
102 const unsigned long *src, int shift, int bits); 102 unsigned int shift, unsigned int nbits);
103extern int __bitmap_and(unsigned long *dst, const unsigned long *bitmap1, 103extern int __bitmap_and(unsigned long *dst, const unsigned long *bitmap1,
104 const unsigned long *bitmap2, unsigned int nbits); 104 const unsigned long *bitmap2, unsigned int nbits);
105extern void __bitmap_or(unsigned long *dst, const unsigned long *bitmap1, 105extern 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
322 __bitmap_shift_right(dst, src, shift, nbits); 322 __bitmap_shift_right(dst, src, shift, nbits);
323} 323}
324 324
325static inline void bitmap_shift_left(unsigned long *dst, 325static inline void bitmap_shift_left(unsigned long *dst, const unsigned long *src,
326 const unsigned long *src, int n, int nbits) 326 unsigned int shift, unsigned int nbits)
327{ 327{
328 if (small_const_nbits(nbits)) 328 if (small_const_nbits(nbits))
329 *dst = (*src << n) & BITMAP_LAST_WORD_MASK(nbits); 329 *dst = (*src << shift) & BITMAP_LAST_WORD_MASK(nbits);
330 else 330 else
331 __bitmap_shift_left(dst, src, n, nbits); 331 __bitmap_shift_left(dst, src, shift, nbits);
332} 332}
333 333
334static inline int bitmap_parse(const char *buf, unsigned int buflen, 334static inline int bitmap_parse(const char *buf, unsigned int buflen,