Subject: [PATCH v2] mm/add_pages: Move Kconfig variable to mm/Kconfig

From: "Aneesh Kumar K.V" <[email-masked]>
Date: Mon, 4 Jul 2022 12:11:42 +0530

No functional change in this patch. This was done so that
the previous change (commit ac790d09885d ("powerpc/memhotplug:
Add add_pages override for PPC")) can be easily backported.

Cc: Michal Hocko <[email-masked]>
Signed-off-by: Aneesh Kumar K.V <[email-masked]>
---
 arch/powerpc/Kconfig | 5 +----
 arch/x86/Kconfig     | 5 +----
 mm/Kconfig           | 3 +++
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 7aa12e88c580..20c1f8e26c96 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -112,6 +112,7 @@ config PPC
 	select ARCH_DISABLE_KASAN_INLINE	if PPC_RADIX_MMU
 	select ARCH_ENABLE_MEMORY_HOTPLUG
 	select ARCH_ENABLE_MEMORY_HOTREMOVE
+	select ARCH_HAS_ADD_PAGES		if ARCH_ENABLE_MEMORY_HOTPLUG
 	select ARCH_HAS_COPY_MC			if PPC64
 	select ARCH_HAS_CURRENT_STACK_POINTER
 	select ARCH_HAS_DEBUG_VIRTUAL
@@ -358,10 +359,6 @@ config ARCH_SUSPEND_NONZERO_CPU
 	def_bool y
 	depends on PPC_POWERNV || PPC_PSERIES
 
-config ARCH_HAS_ADD_PAGES
-	def_bool y
-	depends on ARCH_ENABLE_MEMORY_HOTPLUG
-
 config PPC_DCR_NATIVE
 	bool
 
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index be0b95e51df6..151ddb96ae46 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -68,6 +68,7 @@ config X86
 	select ARCH_ENABLE_SPLIT_PMD_PTLOCK if (PGTABLE_LEVELS > 2) && (X86_64 || X86_PAE)
 	select ARCH_ENABLE_THP_MIGRATION if X86_64 && TRANSPARENT_HUGEPAGE
 	select ARCH_HAS_ACPI_TABLE_UPGRADE	if ACPI
+	select ARCH_HAS_ADD_PAGES		if ARCH_ENABLE_MEMORY_HOTPLUG
 	select ARCH_HAS_CACHE_LINE_SIZE
 	select ARCH_HAS_CURRENT_STACK_POINTER
 	select ARCH_HAS_DEBUG_VIRTUAL
@@ -2453,10 +2454,6 @@ source "kernel/livepatch/Kconfig"
 
 endmenu
 
-config ARCH_HAS_ADD_PAGES
-	def_bool y
-	depends on ARCH_ENABLE_MEMORY_HOTPLUG
-
 config ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE
 	def_bool y
 
diff --git a/mm/Kconfig b/mm/Kconfig
index 169e64192e48..af4e3f9a3019 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -475,6 +475,9 @@ config EXCLUSIVE_SYSTEM_RAM
 config HAVE_BOOTMEM_INFO_NODE
 	def_bool n
 
+config ARCH_HAS_ADD_PAGES
+	bool
+
 config ARCH_ENABLE_MEMORY_HOTPLUG
 	bool
 
-- 
2.36.1