1 files changed, 17 insertions, 5 deletions

diff --git a/include/linux/bitmap.h b/include/linux/bitmap.h
index 5f11fbdc27f8..1ee46f492267 100644
--- a/include/linux/bitmap.h
+++ b/include/linux/bitmap.h
@@ -302,12 +302,20 @@ static inline void bitmap_complement(unsigned long *dst, const unsigned long *sr
                 __bitmap_complement(dst, src, nbits);
 }
 
+#ifdef __LITTLE_ENDIAN
+#define BITMAP_MEM_ALIGNMENT 8
+#else
+#define BITMAP_MEM_ALIGNMENT (8 * sizeof(unsigned long))
+#endif
+#define BITMAP_MEM_MASK (BITMAP_MEM_ALIGNMENT - 1)
+
 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));
-        if (__builtin_constant_p(nbits & 7) && IS_ALIGNED(nbits, 8))
+        if (__builtin_constant_p(nbits & BITMAP_MEM_MASK) &&
+            IS_ALIGNED(nbits, BITMAP_MEM_ALIGNMENT))
                 return !memcmp(src1, src2, nbits / 8);
         return __bitmap_equal(src1, src2, nbits);
 }
@@ -358,8 +366,10 @@ static __always_inline void bitmap_set(unsigned long *map, unsigned int start,
 {
         if (__builtin_constant_p(nbits) && nbits == 1)
                 __set_bit(start, map);
-        else if (__builtin_constant_p(start & 7) && IS_ALIGNED(start, 8) &&
-                 __builtin_constant_p(nbits & 7) && IS_ALIGNED(nbits, 8))
+        else if (__builtin_constant_p(start & BITMAP_MEM_MASK) &&
+                 IS_ALIGNED(start, BITMAP_MEM_ALIGNMENT) &&
+                 __builtin_constant_p(nbits & BITMAP_MEM_MASK) &&
+                 IS_ALIGNED(nbits, BITMAP_MEM_ALIGNMENT))
                 memset((char *)map + start / 8, 0xff, nbits / 8);
         else
                 __bitmap_set(map, start, nbits);
@@ -370,8 +380,10 @@ static __always_inline void bitmap_clear(unsigned long *map, unsigned int start,
 {
         if (__builtin_constant_p(nbits) && nbits == 1)
                 __clear_bit(start, map);
-        else if (__builtin_constant_p(start & 7) && IS_ALIGNED(start, 8) &&
-                 __builtin_constant_p(nbits & 7) && IS_ALIGNED(nbits, 8))
+        else if (__builtin_constant_p(start & BITMAP_MEM_MASK) &&
+                 IS_ALIGNED(start, BITMAP_MEM_ALIGNMENT) &&
+                 __builtin_constant_p(nbits & BITMAP_MEM_MASK) &&
+                 IS_ALIGNED(nbits, BITMAP_MEM_ALIGNMENT))
                 memset((char *)map + start / 8, 0, nbits / 8);
         else
                 __bitmap_clear(map, start, nbits);