diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-08-10 15:11:54 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-08-10 15:11:54 +0300 |
| commit | a2071cd765637002523798358d2ca441306d708b (patch) | |
| tree | bafac1682bfa91457439cad09d2eeea71f2ad3bf /include/linux/bitmap.h | |
| parent | 784bdf3bb694b256fcd6120b93e8947a84249a3a (diff) | |
| parent | a0cba2179ea4c1820fce2ee046b6ed90ecc56196 (diff) | |
| download | linux-a2071cd765637002523798358d2ca441306d708b.tar.xz | |
Merge branch 'linus' into locking/urgent, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/bitmap.h')
| -rw-r--r-- | include/linux/bitmap.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/include/linux/bitmap.h b/include/linux/bitmap.h index e9b0b9ab07e5..598bc999f4c2 100644 --- a/include/linux/bitmap.h +++ b/include/linux/bitmap.h @@ -266,9 +266,12 @@ static inline int bitmap_equal(const unsigned long *src1, const unsigned long *src2, unsigned int nbits) { if (small_const_nbits(nbits)) - return ! ((*src1 ^ *src2) & BITMAP_LAST_WORD_MASK(nbits)); - else - return __bitmap_equal(src1, src2, nbits); + return !((*src1 ^ *src2) & BITMAP_LAST_WORD_MASK(nbits)); +#ifdef CONFIG_S390 + if (__builtin_constant_p(nbits) && (nbits % BITS_PER_LONG) == 0) + return !memcmp(src1, src2, nbits / 8); +#endif + return __bitmap_equal(src1, src2, nbits); } static inline int bitmap_intersects(const unsigned long *src1, |