|
@@ -295,21 +295,21 @@ void bitmap_set(unsigned long *map, unsigned int start, int len)
|
|
|
}
|
|
|
EXPORT_SYMBOL(bitmap_set);
|
|
|
|
|
|
-void bitmap_clear(unsigned long *map, int start, int nr)
|
|
|
+void bitmap_clear(unsigned long *map, unsigned int start, int len)
|
|
|
{
|
|
|
unsigned long *p = map + BIT_WORD(start);
|
|
|
- const int size = start + nr;
|
|
|
+ const unsigned int size = start + len;
|
|
|
int bits_to_clear = BITS_PER_LONG - (start % BITS_PER_LONG);
|
|
|
unsigned long mask_to_clear = BITMAP_FIRST_WORD_MASK(start);
|
|
|
|
|
|
- while (nr - bits_to_clear >= 0) {
|
|
|
+ while (len - bits_to_clear >= 0) {
|
|
|
*p &= ~mask_to_clear;
|
|
|
- nr -= bits_to_clear;
|
|
|
+ len -= bits_to_clear;
|
|
|
bits_to_clear = BITS_PER_LONG;
|
|
|
mask_to_clear = ~0UL;
|
|
|
p++;
|
|
|
}
|
|
|
- if (nr) {
|
|
|
+ if (len) {
|
|
|
mask_to_clear &= BITMAP_LAST_WORD_MASK(size);
|
|
|
*p &= ~mask_to_clear;
|
|
|
}
|