X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=mm%2Fslab_common.c;h=9bbffe82d65af1ad12087ba0587b57346e9bd42b;hb=refs%2Fheads%2Fsandbox%2Fklewandowski%2Frpi5;hp=8fda308e400db80d031a702b58d7ae4980badc43;hpb=7731cb65d1f0cc984c18191ad1b1bbd2817d094c;p=platform%2Fkernel%2Flinux-rpi.git

diff --git a/mm/slab_common.c b/mm/slab_common.c
index 8fda308..9bbffe8 100644
--- 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