diff options
| author |   Russell King <rmk+kernel@armlinux.org.uk> | 2016-11-01 09:17:57 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2016-11-01 09:17:57 +0000 |
| commit | 9902aa4728fe9128ea45f1a772e2238d64d8cdc5 (patch) | |
| tree | cca30efb3ad2126fcb10aa6349ed799a5656e851 /include/linux/bitmap.h | |
| parent | ARM: dts: am335x-boneblack: Add HDMI audio support (diff) | |
| parent | drm/i2c: tda998x: mali-dp: hdlcd: refactor connector registration (diff) | |
Merge branch 'drm-tda998x-mali' into drm-tda998x-devel
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, |