tizen: packaging: Add baselibs.conf to provide 64-bit kernel & modules for 32-bit...

[platform/kernel/linux-rpi.git] / mm / slab_common.c

diff --git a/mm/slab_common.c b/mm/slab_common.c
index 8fda308..9bbffe8 100644 (file)
--- a/mm/slab_common.c
+++ b/mm/slab_common.c
@@ -895,10 +895,13 @@ void __init setup_kmalloc_cache_index_table(void)
 
 static unsigned int __kmalloc_minalign(void)
 {
+       unsigned int minalign = dma_get_cache_alignment();
+
        if (IS_ENABLED(CONFIG_DMA_BOUNCE_UNALIGNED_KMALLOC) &&
            is_swiotlb_allocated())
-               return ARCH_KMALLOC_MINALIGN;
-       return dma_get_cache_alignment();
+               minalign = ARCH_KMALLOC_MINALIGN;
+
+       return max(minalign, arch_slab_minalign());
 }
 
 void __init