aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/bitmap.h
diff options
context:
space:
mode:
authorRasmus Villemoes <linux@rasmusvillemoes.dk>2015-02-12 18:01:53 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2015-02-12 21:54:14 -0500
commit8b4daad52fee7731ea4bae22a99ece2d4ba7ba43 (patch)
treeb569874e38aca1aeb7aacc5faf75eb21c65ecd3a /include/linux/bitmap.h
parentd1214c65c02d503330ce86bd38e344a36599e055 (diff)
lib/bitmap.c: more signed->unsigned conversions
For consistency with the other bitmap_* functions, also make the nbits parameter of bitmap_zero, bitmap_fill and bitmap_copy unsigned. Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/bitmap.h')
-rw-r--r--include/linux/bitmap.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/include/linux/bitmap.h b/include/linux/bitmap.h
index 202e4034fe26..1406d5453781 100644
--- a/include/linux/bitmap.h
+++ b/include/linux/bitmap.h
@@ -185,33 +185,33 @@ extern int bitmap_print_to_pagebuf(bool list, char *buf,
185#define small_const_nbits(nbits) \ 185#define small_const_nbits(nbits) \
186 (__builtin_constant_p(nbits) && (nbits) <= BITS_PER_LONG) 186 (__builtin_constant_p(nbits) && (nbits) <= BITS_PER_LONG)
187 187
188static inline void bitmap_zero(unsigned long *dst, int nbits) 188static inline void bitmap_zero(unsigned long *dst, unsigned int nbits)
189{ 189{
190 if (small_const_nbits(nbits)) 190 if (small_const_nbits(nbits))
191 *dst = 0UL; 191 *dst = 0UL;
192 else { 192 else {
193 int len = BITS_TO_LONGS(nbits) * sizeof(unsigned long); 193 unsigned int len = BITS_TO_LONGS(nbits) * sizeof(unsigned long);
194 memset(dst, 0, len); 194 memset(dst, 0, len);
195 } 195 }
196} 196}
197 197
198static inline void bitmap_fill(unsigned long *dst, int nbits) 198static inline void bitmap_fill(unsigned long *dst, unsigned int nbits)
199{ 199{
200 size_t nlongs = BITS_TO_LONGS(nbits); 200 unsigned int nlongs = BITS_TO_LONGS(nbits);
201 if (!small_const_nbits(nbits)) { 201 if (!small_const_nbits(nbits)) {
202 int len = (nlongs - 1) * sizeof(unsigned long); 202 unsigned int len = (nlongs - 1) * sizeof(unsigned long);
203 memset(dst, 0xff, len); 203 memset(dst, 0xff, len);
204 } 204 }
205 dst[nlongs - 1] = BITMAP_LAST_WORD_MASK(nbits); 205 dst[nlongs - 1] = BITMAP_LAST_WORD_MASK(nbits);
206} 206}
207 207
208static inline void bitmap_copy(unsigned long *dst, const unsigned long *src, 208static inline void bitmap_copy(unsigned long *dst, const unsigned long *src,
209 int nbits) 209 unsigned int nbits)
210{ 210{
211 if (small_const_nbits(nbits)) 211 if (small_const_nbits(nbits))
212 *dst = *src; 212 *dst = *src;
213 else { 213 else {
214 int len = BITS_TO_LONGS(nbits) * sizeof(unsigned long); 214 unsigned int len = BITS_TO_LONGS(nbits) * sizeof(unsigned long);
215 memcpy(dst, src, len); 215 memcpy(dst, src, len);
216 } 216 }
217} 217}