Commit ea885801 authored by Len Brown's avatar Len Brown

[ACPI] delete mention of stale config option ACPI_HT_ONLY

parent e9465823
...@@ -701,7 +701,7 @@ config X86_PAE ...@@ -701,7 +701,7 @@ config X86_PAE
# Common NUMA Features # Common NUMA Features
config NUMA config NUMA
bool "Numa Memory Allocation Support" bool "Numa Memory Allocation Support"
depends on SMP && HIGHMEM64G && (X86_PC || X86_NUMAQ || X86_GENERICARCH || (X86_SUMMIT && ACPI && !ACPI_HT_ONLY)) depends on SMP && HIGHMEM64G && (X86_PC || X86_NUMAQ || X86_GENERICARCH || (X86_SUMMIT && ACPI))
default n if X86_PC default n if X86_PC
default y if (X86_NUMAQ || X86_SUMMIT) default y if (X86_NUMAQ || X86_SUMMIT)
...@@ -709,8 +709,8 @@ config NUMA ...@@ -709,8 +709,8 @@ config NUMA
comment "NUMA (NUMA-Q) requires SMP, 64GB highmem support" comment "NUMA (NUMA-Q) requires SMP, 64GB highmem support"
depends on X86_NUMAQ && (!HIGHMEM64G || !SMP) depends on X86_NUMAQ && (!HIGHMEM64G || !SMP)
comment "NUMA (Summit) requires SMP, 64GB highmem support, full ACPI" comment "NUMA (Summit) requires SMP, 64GB highmem support, ACPI"
depends on X86_SUMMIT && (!HIGHMEM64G || !ACPI || ACPI_HT_ONLY) depends on X86_SUMMIT && (!HIGHMEM64G || !ACPI)
config DISCONTIGMEM config DISCONTIGMEM
bool bool
......
...@@ -634,7 +634,7 @@ void __init get_smp_config (void) ...@@ -634,7 +634,7 @@ void __init get_smp_config (void)
/* /*
* ACPI may be used to obtain the entire SMP configuration or just to * ACPI may be used to obtain the entire SMP configuration or just to
* enumerate/configure processors (CONFIG_ACPI_HT). Note that * enumerate/configure processors (CONFIG_ACPI_BOOT). Note that
* ACPI supports both logical (e.g. Hyper-Threading) and physical * ACPI supports both logical (e.g. Hyper-Threading) and physical
* processors, where MPS only supports physical. * processors, where MPS only supports physical.
*/ */
......
...@@ -487,7 +487,7 @@ void __init get_smp_config (void) ...@@ -487,7 +487,7 @@ void __init get_smp_config (void)
/* /*
* ACPI may be used to obtain the entire SMP configuration or just to * ACPI may be used to obtain the entire SMP configuration or just to
* enumerate/configure processors (CONFIG_ACPI_HT_ONLY). Note that * enumerate/configure processors (CONFIG_ACPI_BOOT). Note that
* ACPI supports both logical (e.g. Hyper-Threading) and physical * ACPI supports both logical (e.g. Hyper-Threading) and physical
* processors, where MPS only supports physical. * processors, where MPS only supports physical.
*/ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment