| Message ID | 20210929143600.49379-2-david@redhat.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | mm/memory_hotplug: Kconfig and 32 bit cleanups | expand |
On Wed, Sep 29, 2021 at 04:35:55PM +0200, David Hildenbrand wrote: > SPARSEMEM is the only possible memory model for x86-64, FLATMEM is not > possible: > config ARCH_FLATMEM_ENABLE > def_bool y > depends on X86_32 && !NUMA > > And X86_64_ACPI_NUMA (obviously) only supports x86-64: > config X86_64_ACPI_NUMA > def_bool y > depends on X86_64 && NUMA && ACPI && PCI > > Let's just remove the CONFIG_X86_64_ACPI_NUMA dependency, as it does no > longer make sense. > > Signed-off-by: David Hildenbrand <david@redhat.com> Reviewed-by: Oscar Salvador <osalvador@suse.de> > --- > mm/Kconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/mm/Kconfig b/mm/Kconfig > index d16ba9249bc5..b7fb3f0b485e 100644 > --- a/mm/Kconfig > +++ b/mm/Kconfig > @@ -123,7 +123,7 @@ config ARCH_ENABLE_MEMORY_HOTPLUG > config MEMORY_HOTPLUG > bool "Allow for memory hot-add" > select MEMORY_ISOLATION > - depends on SPARSEMEM || X86_64_ACPI_NUMA > + depends on SPARSEMEM > depends on ARCH_ENABLE_MEMORY_HOTPLUG > depends on 64BIT || BROKEN > select NUMA_KEEP_MEMINFO if NUMA > -- > 2.31.1 > >
diff --git a/mm/Kconfig b/mm/Kconfig index d16ba9249bc5..b7fb3f0b485e 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -123,7 +123,7 @@ config ARCH_ENABLE_MEMORY_HOTPLUG config MEMORY_HOTPLUG bool "Allow for memory hot-add" select MEMORY_ISOLATION - depends on SPARSEMEM || X86_64_ACPI_NUMA + depends on SPARSEMEM depends on ARCH_ENABLE_MEMORY_HOTPLUG depends on 64BIT || BROKEN select NUMA_KEEP_MEMINFO if NUMA
SPARSEMEM is the only possible memory model for x86-64, FLATMEM is not possible: config ARCH_FLATMEM_ENABLE def_bool y depends on X86_32 && !NUMA And X86_64_ACPI_NUMA (obviously) only supports x86-64: config X86_64_ACPI_NUMA def_bool y depends on X86_64 && NUMA && ACPI && PCI Let's just remove the CONFIG_X86_64_ACPI_NUMA dependency, as it does no longer make sense. Signed-off-by: David Hildenbrand <david@redhat.com> --- mm/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)