summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorKefeng Wang <wangkefeng.wang@huawei.com>2016-09-26 15:36:50 +0800
committerWill Deacon <will.deacon@arm.com>2016-09-26 14:25:43 +0100
commit0c2a6cce1776ed041b71a305edcb7d89923743e1 (patch)
tree1c6bd095ab509b2dbd62a224e9f1ef1e36b54a59 /arch
parentb5e7307d9d5a340d2c9fabbe1cee137d4c682c71 (diff)
downloadlinux-0c2a6cce1776ed041b71a305edcb7d89923743e1.tar.bz2
arm64: Kconfig: select OF/ACPI_NUMA under NUMA config
Move OF_NUMA select under NUMA config, and select ACPI_NUMA when ACPI enabled. Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com> Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm64/Kconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 8f868ec4e27f..4572f00e64f5 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -103,7 +103,6 @@ config ARM64
select NO_BOOTMEM
select OF
select OF_EARLY_FLATTREE
- select OF_NUMA if NUMA && OF
select OF_RESERVED_MEM
select PCI_ECAM if ACPI
select POWER_RESET
@@ -581,6 +580,8 @@ config HOTPLUG_CPU
config NUMA
bool "Numa Memory Allocation and Scheduler Support"
depends on SMP
+ select ACPI_NUMA if ACPI
+ select OF_NUMA
help
Enable NUMA (Non Uniform Memory Access) support.