History

lib: bitmap: make nbits parameter of bitmap_{and,or,xor,andnot} unsigned

This change is only for consistency with the changes to the other bitmap_* functions; it doesn't change the size of the generated code: inside BITS_TO_LONGS there is a sizeof(long), which causes bits to be interpreted as unsigned anyway.

Rasmus Villemoes committed 12 years ago

Commit 2f9305e1 parent 65b4ee62 files · +20 −20Browse files

Unified · Split

2 files
  1. include/linux/bitmap.h +8 −8
  2. lib/bitmap.c +12 −12
include/linux/bitmap.h+8−8
@@ -99,13 +99,13 @@ extern void __bitmap_shift_right(unsigned long *dst, · 98 unmodified lines
9999 extern void __bitmap_shift_left(unsigned long *dst,
100100 const unsigned long *src, int shift, int bits);
101101 extern int __bitmap_and(unsigned long *dst, const unsigned long *bitmap1,
102− const unsigned long *bitmap2, int bits);
102+ const unsigned long *bitmap2, unsigned int nbits);
103103 extern void __bitmap_or(unsigned long *dst, const unsigned long *bitmap1,
104− const unsigned long *bitmap2, int bits);
104+ const unsigned long *bitmap2, unsigned int nbits);
105105 extern void __bitmap_xor(unsigned long *dst, const unsigned long *bitmap1,
106− const unsigned long *bitmap2, int bits);
106+ const unsigned long *bitmap2, unsigned int nbits);
107107 extern int __bitmap_andnot(unsigned long *dst, const unsigned long *bitmap1,
108− const unsigned long *bitmap2, int bits);
108+ const unsigned long *bitmap2, unsigned int nbits);
109109 extern int __bitmap_intersects(const unsigned long *bitmap1,
110110 const unsigned long *bitmap2, int bits);
111111 extern int __bitmap_subset(const unsigned long *bitmap1,
@@ -188,7 +188,7 @@ static inline void bitmap_copy(unsigned long *dst, const unsigned long *src, · 76 unmodified lines
188188 }
189189
190190 static inline int bitmap_and(unsigned long *dst, const unsigned long *src1,
191− const unsigned long *src2, int nbits)
191+ const unsigned long *src2, unsigned int nbits)
192192 {
193193 if (small_const_nbits(nbits))
194194 return (*dst = *src1 & *src2) != 0;
@@ -196,7 +196,7 @@ static inline int bitmap_and(unsigned long *dst, const unsigned long *src1, · 1 unmodified line
196196 }
197197
198198 static inline void bitmap_or(unsigned long *dst, const unsigned long *src1,
199− const unsigned long *src2, int nbits)
199+ const unsigned long *src2, unsigned int nbits)
200200 {
201201 if (small_const_nbits(nbits))
202202 *dst = *src1 | *src2;
@@ -205,7 +205,7 @@ static inline void bitmap_or(unsigned long *dst, const unsigned long *src1, · 2 unmodified lines
205205 }
206206
207207 static inline void bitmap_xor(unsigned long *dst, const unsigned long *src1,
208− const unsigned long *src2, int nbits)
208+ const unsigned long *src2, unsigned int nbits)
209209 {
210210 if (small_const_nbits(nbits))
211211 *dst = *src1 ^ *src2;
@@ -214,7 +214,7 @@ static inline void bitmap_xor(unsigned long *dst, const unsigned long *src1, · 2 unmodified lines
214214 }
215215
216216 static inline int bitmap_andnot(unsigned long *dst, const unsigned long *src1,
217− const unsigned long *src2, int nbits)
217+ const unsigned long *src2, unsigned int nbits)
218218 {
219219 if (small_const_nbits(nbits))
220220 return (*dst = *src1 & ~(*src2)) != 0;
lib/bitmap.c+12−12
@@ -182,10 +182,10 @@ void __bitmap_shift_left(unsigned long *dst, · 181 unmodified lines
182182 EXPORT_SYMBOL(__bitmap_shift_left);
183183
184184 int __bitmap_and(unsigned long *dst, const unsigned long *bitmap1,
185− const unsigned long *bitmap2, int bits)
185+ const unsigned long *bitmap2, unsigned int bits)
186186 {
187− int k;
188− int nr = BITS_TO_LONGS(bits);
187+ unsigned int k;
188+ unsigned int nr = BITS_TO_LONGS(bits);
189189 unsigned long result = 0;
190190
191191 for (k = 0; k < nr; k++)
@@ -195,10 +195,10 @@ int __bitmap_and(unsigned long *dst, const unsigned long *bitmap1, · 3 unmodified lines
195195 EXPORT_SYMBOL(__bitmap_and);
196196
197197 void __bitmap_or(unsigned long *dst, const unsigned long *bitmap1,
198− const unsigned long *bitmap2, int bits)
198+ const unsigned long *bitmap2, unsigned int bits)
199199 {
200− int k;
201− int nr = BITS_TO_LONGS(bits);
200+ unsigned int k;
201+ unsigned int nr = BITS_TO_LONGS(bits);
202202
203203 for (k = 0; k < nr; k++)
204204 dst[k] = bitmap1[k] | bitmap2[k];
@@ -206,10 +206,10 @@ void __bitmap_or(unsigned long *dst, const unsigned long *bitmap1, · 1 unmodified line
206206 EXPORT_SYMBOL(__bitmap_or);
207207
208208 void __bitmap_xor(unsigned long *dst, const unsigned long *bitmap1,
209− const unsigned long *bitmap2, int bits)
209+ const unsigned long *bitmap2, unsigned int bits)
210210 {
211− int k;
212− int nr = BITS_TO_LONGS(bits);
211+ unsigned int k;
212+ unsigned int nr = BITS_TO_LONGS(bits);
213213
214214 for (k = 0; k < nr; k++)
215215 dst[k] = bitmap1[k] ^ bitmap2[k];
@@ -217,10 +217,10 @@ void __bitmap_xor(unsigned long *dst, const unsigned long *bitmap1, · 1 unmodified line
217217 EXPORT_SYMBOL(__bitmap_xor);
218218
219219 int __bitmap_andnot(unsigned long *dst, const unsigned long *bitmap1,
220− const unsigned long *bitmap2, int bits)
220+ const unsigned long *bitmap2, unsigned int bits)
221221 {
222− int k;
223− int nr = BITS_TO_LONGS(bits);
222+ unsigned int k;
223+ unsigned int nr = BITS_TO_LONGS(bits);
224224 unsigned long result = 0;
225225
226226 for (k = 0; k < nr; k++)