summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorCatalin Marinas <catalin.marinas@arm.com>2016-08-15 16:33:10 +0100
committerCatalin Marinas <catalin.marinas@arm.com>2016-08-17 17:16:58 +0100
commitbfe6c8a89e03f52bccf922f74ced8fe959e7fd36 (patch)
treef13dfc2fc1db4dd2d2c62454c2970bd37479df14 /arch
parent694d0d0bb2030d2e36df73e2d23d5770511dbc8d (diff)
downloadlinux-bfe6c8a89e03f52bccf922f74ced8fe959e7fd36.tar.gz
linux-bfe6c8a89e03f52bccf922f74ced8fe959e7fd36.tar.bz2
linux-bfe6c8a89e03f52bccf922f74ced8fe959e7fd36.zip
arm64: Fix NUMA build error when !CONFIG_ACPI
Since asm/acpi.h is only included by linux/acpi.h when CONFIG_ACPI is enabled, disabling the latter leads to the following build error on arm64: arch/arm64/mm/numa.c: In function ‘arm64_numa_init’: arch/arm64/mm/numa.c:395:24: error: ‘arm64_acpi_numa_init’ undeclared (first use in this function) if (!acpi_disabled && !numa_init(arm64_acpi_numa_init)) This patch include the asm/acpi.h explicitly in arch/arm64/mm/numa.c for the arm64_acpi_numa_init() definition. Fixes: d8b47fca8c23 ("arm64, ACPI, NUMA: NUMA support based on SRAT and SLIT") Reviewed-by: Hanjun Guo <hanjun.guo@linaro.org> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm64/mm/numa.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/mm/numa.c b/arch/arm64/mm/numa.c
index c7fe3ec70774..5bb15eab6f00 100644
--- a/arch/arm64/mm/numa.c
+++ b/arch/arm64/mm/numa.c
@@ -23,6 +23,8 @@
#include <linux/module.h>
#include <linux/of.h>
+#include <asm/acpi.h>
+
struct pglist_data *node_data[MAX_NUMNODES] __read_mostly;
EXPORT_SYMBOL(node_data);
nodemask_t numa_nodes_parsed __initdata;