projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'bitmap-6.0-rc1' of https://github.com/norov/linux
[linux-2.6-microblaze.git]
/
lib
/
bitmap.c
diff --git
a/lib/bitmap.c
b/lib/bitmap.c
index
b18e31e
..
488e6c3
100644
(file)
--- a/
lib/bitmap.c
+++ b/
lib/bitmap.c
@@
-237,7
+237,7
@@
void bitmap_cut(unsigned long *dst, const unsigned long *src,
}
EXPORT_SYMBOL(bitmap_cut);
}
EXPORT_SYMBOL(bitmap_cut);
-
int
__bitmap_and(unsigned long *dst, const unsigned long *bitmap1,
+
bool
__bitmap_and(unsigned long *dst, const unsigned long *bitmap1,
const unsigned long *bitmap2, unsigned int bits)
{
unsigned int k;
const unsigned long *bitmap2, unsigned int bits)
{
unsigned int k;
@@
-275,7
+275,7
@@
void __bitmap_xor(unsigned long *dst, const unsigned long *bitmap1,
}
EXPORT_SYMBOL(__bitmap_xor);
}
EXPORT_SYMBOL(__bitmap_xor);
-
int
__bitmap_andnot(unsigned long *dst, const unsigned long *bitmap1,
+
bool
__bitmap_andnot(unsigned long *dst, const unsigned long *bitmap1,
const unsigned long *bitmap2, unsigned int bits)
{
unsigned int k;
const unsigned long *bitmap2, unsigned int bits)
{
unsigned int k;
@@
-333,10
+333,9
@@
bool __bitmap_subset(const unsigned long *bitmap1,
}
EXPORT_SYMBOL(__bitmap_subset);
}
EXPORT_SYMBOL(__bitmap_subset);
-int __bitmap_weight(const unsigned long *bitmap, unsigned int bits)
+
unsigned
int __bitmap_weight(const unsigned long *bitmap, unsigned int bits)
{
{
- unsigned int k, lim = bits/BITS_PER_LONG;
- int w = 0;
+ unsigned int k, lim = bits/BITS_PER_LONG, w = 0;
for (k = 0; k < lim; k++)
w += hweight_long(bitmap[k]);
for (k = 0; k < lim; k++)
w += hweight_long(bitmap[k]);
@@
-1564,7
+1563,7
@@
void bitmap_to_arr64(u64 *buf, const unsigned long *bitmap, unsigned int nbits)
/* Clear tail bits in the last element of array beyond nbits. */
if (nbits % 64)
/* Clear tail bits in the last element of array beyond nbits. */
if (nbits % 64)
- buf[-1] &= GENMASK_ULL(
nbits
% 64, 0);
+ buf[-1] &= GENMASK_ULL(
(nbits - 1)
% 64, 0);
}
EXPORT_SYMBOL(bitmap_to_arr64);
#endif
}
EXPORT_SYMBOL(bitmap_to_arr64);
#endif