bitmap: use memcmp optimisation in more situations

[linux-2.6-microblaze.git] / include / linux / bitmap.h

diff --git a/include/linux/bitmap.h b/include/linux/bitmap.h
index c04c9d1..5797ca6 100644 (file)
--- a/include/linux/bitmap.h
+++ b/include/linux/bitmap.h
@@ -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);
-#endif
        return __bitmap_equal(src1, src2, nbits);
 }