Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...

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

diff --git a/include/linux/bitmap.h b/include/linux/bitmap.h
index e9b0b9ab07e5a58a14b5ed0648fb879962e2c6c7..27bfc0b631a98373c3af7d3f8878aa75006303ba 100644 (file)
--- a/include/linux/bitmap.h
+++ b/include/linux/bitmap.h
@@ -267,6 +267,10 @@ 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
+       else if (__builtin_constant_p(nbits) && (nbits % BITS_PER_LONG) == 0)
+               return !memcmp(src1, src2, nbits / 8);
+#endif
        else
                return __bitmap_equal(src1, src2, nbits);
 }