ACPI: NUMA: change the ACPI_NUMA to a hidden option

x86/arm64/loongarch would select ACPI_NUMA by default and riscv
would do the same thing, so change it to a hidden option and the
select statements except for the X86_64_ACPI_NUMA can also go away.

Suggested-by: Arnd Bergmann <arnd@arndb.de>
Suggested-by: Sunil V L <sunilvl@ventanamicro.com>
Signed-off-by: Haibo Xu <haibo1.xu@intel.com>
Reviewed-by: Sunil V L <sunilvl@ventanamicro.com>
Acked-by: Huacai Chen <chenhuacai@loongson.cn>
Acked-by: Will Deacon <will@kernel.org>
Reviewed-by: Hanjun Guo <guohanjun@huawei.com>
Link: https://lore.kernel.org/r/f1f96377b8ecd6e3183f28abf5c9ac21cb9855ea.1718268003.git.haibo1.xu@intel.com
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>

diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 5d91259..5079ad4 100644 (file)
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -1484,7 +1484,6 @@ config HOTPLUG_CPU
 config NUMA
        bool "NUMA Memory Allocation and Scheduler Support"
        select GENERIC_ARCH_NUMA
-       select ACPI_NUMA if ACPI
        select OF_NUMA
        select HAVE_SETUP_PER_CPU_AREA
        select NEED_PER_CPU_EMBED_FIRST_CHUNK

diff --git a/arch/loongarch/Kconfig b/arch/loongarch/Kconfig
index e38139c..8d9e06e 100644 (file)
--- a/arch/loongarch/Kconfig
+++ b/arch/loongarch/Kconfig
@@ -470,7 +470,6 @@ config NR_CPUS
 config NUMA
        bool "NUMA Support"
        select SMP
-       select ACPI_NUMA if ACPI
        help
          Say Y to compile the kernel with NUMA (Non-Uniform Memory Access)
          support.  This option improves performance on systems with more

diff --git a/drivers/acpi/numa/Kconfig b/drivers/acpi/numa/Kconfig
index 849c2bd..f33194d 100644 (file)
--- a/drivers/acpi/numa/Kconfig
+++ b/drivers/acpi/numa/Kconfig
@@ -1,9 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0
 config ACPI_NUMA
-       bool "NUMA support"
-       depends on NUMA
-       depends on (X86 || ARM64 || LOONGARCH)
-       default y if ARM64
+       def_bool NUMA && !X86
 
 config ACPI_HMAT
        bool "ACPI Heterogeneous Memory Attribute Table Support"