From 73d746eecfbe83ae70b34fb8361fb3ea36da41eb Mon Sep 17 00:00:00 2001 From: Simon Xue Date: Tue, 23 Jul 2024 17:09:43 +0800 Subject: [PATCH] mm/slab: allows kmalloc min size independent on arch dma min alignment when CONFIG_ROCKCHIP_KMALLOC_NO_USE_ARCH_DMA_MINALIGN=y CONFIG_ROCKCHIP_MINI_KERNEL enabled in some project which perform DMA into kmalloc area that may cause data corrupt. Use a independent config CONFIG_ROCKCHIP_KMALLOC_NO_USE_ARCH_DMA_MINALIGN instead of CONFIG_ROCKCHIP_MINI_KERNEL Fixes: c97fea6ed13d ("slab: allows kmalloc min size independent on arch dma min alignment when CONFIG_ROCKCHIP_MINI_KERNEL=y") Change-Id: Idd36490d695a0f2910d2b453228688405efdd43a Signed-off-by: Simon Xue --- include/linux/slab.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/slab.h b/include/linux/slab.h index 43b414344987..92bf70c8ad89 100644 --- a/include/linux/slab.h +++ b/include/linux/slab.h @@ -221,7 +221,7 @@ void kmem_dump_obj(void *object); * alignment larger than the alignment of a 64-bit integer. * Setting ARCH_DMA_MINALIGN in arch headers allows that. */ -#if defined(ARCH_DMA_MINALIGN) && ARCH_DMA_MINALIGN > 8 && !IS_ENABLED(CONFIG_ROCKCHIP_MINI_KERNEL) +#if defined(ARCH_DMA_MINALIGN) && ARCH_DMA_MINALIGN > 8 && !IS_ENABLED(CONFIG_ROCKCHIP_KMALLOC_NO_USE_ARCH_DMA_MINALIGN) #define ARCH_KMALLOC_MINALIGN ARCH_DMA_MINALIGN #define KMALLOC_MIN_SIZE ARCH_DMA_MINALIGN #define KMALLOC_SHIFT_LOW ilog2(ARCH_DMA_MINALIGN)