From 74b51b5a06dfff70fff94636eb6916de522dab05 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Thu, 15 Apr 2021 01:11:09 +0200 Subject: [PATCH] kernel: Disable CONFIG_DMA_PERNUMA_CMA by default This CMA memory allocation option only applies to NUMA (Non-Uniform Memory Access) systems which are seldom the kind of systems that OpenWRT address. It is safe to assume that any system that need this option would turn it on locally. Signed-off-by: Linus Walleij --- target/linux/generic/config-5.10 | 1 + target/linux/oxnas/config-5.10 | 1 - target/linux/rockchip/armv8/config-5.10 | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/target/linux/generic/config-5.10 b/target/linux/generic/config-5.10 index e7751969f6..ef62b78483 100644 --- a/target/linux/generic/config-5.10 +++ b/target/linux/generic/config-5.10 @@ -1354,6 +1354,7 @@ CONFIG_DMA_DECLARE_COHERENT=y # CONFIG_DMA_JZ4780 is not set CONFIG_DMA_NONCOHERENT_MMAP=y # CONFIG_DMA_NOOP_OPS is not set +# CONFIG_DMA_PERNUMA_CMA is not set # CONFIG_DMA_SHARED_BUFFER is not set # CONFIG_DMA_VIRT_OPS is not set # CONFIG_DM_CACHE is not set diff --git a/target/linux/oxnas/config-5.10 b/target/linux/oxnas/config-5.10 index 448cb41c33..f5d782e9bb 100644 --- a/target/linux/oxnas/config-5.10 +++ b/target/linux/oxnas/config-5.10 @@ -121,7 +121,6 @@ CONFIG_DECOMPRESS_XZ=y CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y CONFIG_DMA_CMA=y -# CONFIG_DMA_PERNUMA_CMA is not set CONFIG_DMA_REMAP=y CONFIG_DNOTIFY=y CONFIG_DTC=y diff --git a/target/linux/rockchip/armv8/config-5.10 b/target/linux/rockchip/armv8/config-5.10 index e68534f2ae..5e5c7f2507 100644 --- a/target/linux/rockchip/armv8/config-5.10 +++ b/target/linux/rockchip/armv8/config-5.10 @@ -185,7 +185,6 @@ CONFIG_DMA_DIRECT_REMAP=y CONFIG_DMA_ENGINE=y CONFIG_DMA_OF=y CONFIG_DMA_OPS=y -# CONFIG_DMA_PERNUMA_CMA is not set CONFIG_DMA_REMAP=y CONFIG_DMA_SHARED_BUFFER=y CONFIG_DNOTIFY=y -- 2.30.2