aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorRasmus Villemoes <linux@rasmusvillemoes.dk>2014-08-06 19:10:07 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-08-06 21:01:26 -0400
commitfb5ac54263ef3fcb5c469a61e0ab6b06e45e2307 (patch)
tree1ef13efebe4bba70e37db0283b234a05ed4900c1 /lib
parent877d9f3b63ac2e5dbc51cbcdff156433f03b3a32 (diff)
lib: bitmap: make the start index of bitmap_set unsigned
The compiler can generate slightly smaller and simpler code when it knows that "start" is non-negative. Also, use the names "start" and "len" for the two parameters in both header file and implementation, instead of the previous mix. 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 'lib')
-rw-r--r--lib/bitmap.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/bitmap.c b/lib/bitmap.c
index f69435c23f9c..2a3a92fc3355 100644
--- a/lib/bitmap.c
+++ b/lib/bitmap.c
@@ -274,21 +274,21 @@ int __bitmap_weight(const unsigned long *bitmap, unsigned int bits)
274} 274}
275EXPORT_SYMBOL(__bitmap_weight); 275EXPORT_SYMBOL(__bitmap_weight);
276 276
277void bitmap_set(unsigned long *map, int start, int nr) 277void bitmap_set(unsigned long *map, unsigned int start, int len)
278{ 278{
279 unsigned long *p = map + BIT_WORD(start); 279 unsigned long *p = map + BIT_WORD(start);
280 const int size = start + nr; 280 const unsigned int size = start + len;
281 int bits_to_set = BITS_PER_LONG - (start % BITS_PER_LONG); 281 int bits_to_set = BITS_PER_LONG - (start % BITS_PER_LONG);
282 unsigned long mask_to_set = BITMAP_FIRST_WORD_MASK(start); 282 unsigned long mask_to_set = BITMAP_FIRST_WORD_MASK(start);
283 283
284 while (nr - bits_to_set >= 0) { 284 while (len - bits_to_set >= 0) {
285 *p |= mask_to_set; 285 *p |= mask_to_set;
286 nr -= bits_to_set; 286 len -= bits_to_set;
287 bits_to_set = BITS_PER_LONG; 287 bits_to_set = BITS_PER_LONG;
288 mask_to_set = ~0UL; 288 mask_to_set = ~0UL;
289 p++; 289 p++;
290 } 290 }
291 if (nr) { 291 if (len) {
292 mask_to_set &= BITMAP_LAST_WORD_MASK(size); 292 mask_to_set &= BITMAP_LAST_WORD_MASK(size);
293 *p |= mask_to_set; 293 *p |= mask_to_set;
294 } 294 }