Commit 2c6deb01 authored by Matthew Wilcox's avatar Matthew Wilcox Committed by Linus Torvalds
Browse files

bitmap: use memcmp optimisation in more situations

Commit 7dd96816 ("bitmap: bitmap_equal memcmp optimization") was
rather more restrictive than necessary; we can use memcmp() to implement
bitmap_equal() as long as the number of bits can be proved to be a
multiple of 8.  And architectures other than s390 may be able to make
good use of this optimisation.

[ fix build: add a memcmp() declaration]

Signed-off-by: default avatarMatthew Wilcox <>
Signed-off-by: default avatarArnd Bergmann <>
Acked-by: default avatarRasmus Villemoes <>
Signed-off-by: default avatarAndrew Morton <>
Signed-off-by: default avatarLinus Torvalds <>
parent 2a98dc02
......@@ -33,6 +33,7 @@ extern void error(char *);
/* Not needed, but used in some headers pulled in by decompressors */
extern char * strstr(const char * s1, const char *s2);
extern size_t strlen(const char *s);
extern int memcmp(const void *cs, const void *ct, size_t count);
#include "../../../../lib/decompress_inflate.c"
......@@ -266,10 +266,8 @@ static inline int bitmap_equal(const unsigned long *src1,
if (small_const_nbits(nbits))
return !((*src1 ^ *src2) & BITMAP_LAST_WORD_MASK(nbits));
#ifdef CONFIG_S390
if (__builtin_constant_p(nbits) && (nbits % BITS_PER_LONG) == 0)
if (__builtin_constant_p(nbits & 7) && IS_ALIGNED(nbits, 8))
return !memcmp(src1, src2, nbits / 8);
return __bitmap_equal(src1, src2, nbits);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment