korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-24 12:44:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

lib: bitmap: make nbits parameter of bitmap_subset unsigned

Browse Source 
The compiler can generate slightly smaller and simpler code when it
knows that "nbits" is non-negative.  Since no-one passes a negative
bit-count, this shouldn't affect the semantics.

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>
This commit is contained in:
Rasmus Villemoes 2014-08-06 16:10:03 -07:00 committed by Linus Torvalds
parent 6dfe9799c2
commit 5be20213e8
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/bitmap.h
View File

@ -109,7 +109,7 @@ extern int __bitmap_andnot(unsigned long *dst, const unsigned long *bitmap1,
extern int __bitmap_intersects(const unsigned long *bitmap1, extern int __bitmap_intersects(const unsigned long *bitmap1,
const unsigned long *bitmap2, unsigned int nbits); const unsigned long *bitmap2, unsigned int nbits);
extern int __bitmap_subset(const unsigned long *bitmap1, extern int __bitmap_subset(const unsigned long *bitmap1,
const unsigned long *bitmap2, int bits); const unsigned long *bitmap2, unsigned int nbits);
extern int __bitmap_weight(const unsigned long *bitmap, int bits); extern int __bitmap_weight(const unsigned long *bitmap, int bits);
extern void bitmap_set(unsigned long *map, int i, int len); extern void bitmap_set(unsigned long *map, int i, int len);
@ -249,7 +249,7 @@ static inline int bitmap_intersects(const unsigned long *src1,
} }
static inline int bitmap_subset(const unsigned long *src1, static inline int bitmap_subset(const unsigned long *src1,
const unsigned long *src2, int nbits) const unsigned long *src2, unsigned int nbits)
{ {
if (small_const_nbits(nbits)) if (small_const_nbits(nbits))
return ! ((*src1 & ~(*src2)) & BITMAP_LAST_WORD_MASK(nbits)); return ! ((*src1 & ~(*src2)) & BITMAP_LAST_WORD_MASK(nbits));

4
lib/bitmap.c
View File

@ -245,9 +245,9 @@ int __bitmap_intersects(const unsigned long *bitmap1,
EXPORT_SYMBOL(__bitmap_intersects); EXPORT_SYMBOL(__bitmap_intersects);
int __bitmap_subset(const unsigned long *bitmap1, int __bitmap_subset(const unsigned long *bitmap1,
const unsigned long *bitmap2, int bits) const unsigned long *bitmap2, unsigned int bits)
{ {
int k, lim = bits/BITS_PER_LONG; unsigned int k, lim = bits/BITS_PER_LONG;
for (k = 0; k < lim; ++k) for (k = 0; k < lim; ++k)
if (bitmap1[k] & ~bitmap2[k]) if (bitmap1[k] & ~bitmap2[k])
return 0; return 0;