The quilt patch titled
Subject: mm/cma: make MAX_CMA_AREAS = CONFIG_CMA_AREAS
has been removed from the -mm tree. Its filename was
mm-cma-make-max_cma_areas-=-config_cma_areas.patch
This patch was dropped because it was merged into the mm-stable branch
of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Anshuman Khandual <anshuman.khandual@xxxxxxx>
Subject: mm/cma: make MAX_CMA_AREAS = CONFIG_CMA_AREAS
Date: Mon, 5 Feb 2024 10:49:29 +0530
There is no real difference between the global area, and other
additionally configured CMA areas via CONFIG_CMA_AREAS that always
defaults without user input. This makes MAX_CMA_AREAS same as
CONFIG_CMA_AREAS, also incrementing its default values, thus maintaining
current default for MAX_CMA_AREAS both for UMA and NUMA systems.
Link: https://lkml.kernel.org/r/20240205051929.298559-1-anshuman.khandual@xxxxxxx
Signed-off-by: Anshuman Khandual <anshuman.khandual@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/cma.h | 6 +-----
mm/Kconfig | 6 +++---
2 files changed, 4 insertions(+), 8 deletions(-)
--- a/include/linux/cma.h~mm-cma-make-max_cma_areas-=-config_cma_areas
+++ a/include/linux/cma.h
@@ -6,12 +6,8 @@
#include <linux/types.h>
#include <linux/numa.h>
-/*
- * There is always at least global CMA area and a few optional
- * areas configured in kernel .config.
- */
#ifdef CONFIG_CMA_AREAS
-#define MAX_CMA_AREAS (1 + CONFIG_CMA_AREAS)
+#define MAX_CMA_AREAS CONFIG_CMA_AREAS
#endif
#define CMA_MAX_NAME 64
--- a/mm/Kconfig~mm-cma-make-max_cma_areas-=-config_cma_areas
+++ a/mm/Kconfig
@@ -917,14 +917,14 @@ config CMA_SYSFS
config CMA_AREAS
int "Maximum count of the CMA areas"
depends on CMA
- default 19 if NUMA
- default 7
+ default 20 if NUMA
+ default 8
help
CMA allows to create CMA areas for particular purpose, mainly,
used as device private area. This parameter sets the maximum
number of CMA area in the system.
- If unsure, leave the default value "7" in UMA and "19" in NUMA.
+ If unsure, leave the default value "8" in UMA and "20" in NUMA.
config MEM_SOFT_DIRTY
bool "Track memory changes"
_
Patches currently in -mm which might be from anshuman.khandual@xxxxxxx are
