summaryrefslogtreecommitdiffstats
path: root/arch/arm64/kernel/acpi_numa.c
diff options
context:
space:
mode:
authorZhen Lei2016-09-01 08:54:56 +0200
committerWill Deacon2016-09-09 15:59:08 +0200
commit794224ea565c439ca624a3760ac220928463ea17 (patch)
tree07e048febf683529c678f7cc488d2f388b06ee26 /arch/arm64/kernel/acpi_numa.c
parentof/numa: remove a duplicated warning (diff)
downloadkernel-qcow2-linux-794224ea565c439ca624a3760ac220928463ea17.tar.gz
kernel-qcow2-linux-794224ea565c439ca624a3760ac220928463ea17.tar.xz
kernel-qcow2-linux-794224ea565c439ca624a3760ac220928463ea17.zip
arm64/numa: avoid inconsistent information to be printed
numa_init may return error because of numa configuration error. So "No NUMA configuration found" is inaccurate. In fact, specific configuration error information should be immediately printed by the testing branch. Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com> Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm64/kernel/acpi_numa.c')
-rw-r--r--arch/arm64/kernel/acpi_numa.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm64/kernel/acpi_numa.c b/arch/arm64/kernel/acpi_numa.c
index f85149cc7c71..f01fab637dab 100644
--- a/arch/arm64/kernel/acpi_numa.c
+++ b/arch/arm64/kernel/acpi_numa.c
@@ -105,8 +105,10 @@ int __init arm64_acpi_numa_init(void)
int ret;
ret = acpi_numa_init();
- if (ret)
+ if (ret) {
+ pr_info("Failed to initialise from firmware\n");
return ret;
+ }
return srat_disabled() ? -EINVAL : 0;
}