1 files changed, 7 insertions, 4 deletions

diff --git a/mm/slub.c b/mm/slub.c
index a96e11c77fd9..96d63eb3ab17 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -1856,12 +1856,15 @@ static unsigned long calculate_alignment(unsigned long flags,
          * The hardware cache alignment cannot override the specified
          * alignment though. If that is greater then use it.
          */
-        if ((flags & SLAB_HWCACHE_ALIGN) &&
-                        size > cache_line_size() / 2)
-                return max_t(unsigned long, align, cache_line_size());
+        if (flags & SLAB_HWCACHE_ALIGN) {
+                unsigned long ralign = cache_line_size();
+                while (size <= ralign / 2)
+                        ralign /= 2;
+                align = max(align, ralign);
+        }
 
         if (align < ARCH_SLAB_MINALIGN)
-                return ARCH_SLAB_MINALIGN;
+                align = ARCH_SLAB_MINALIGN;
 
         return ALIGN(align, sizeof(void *));
 }