diff options
| author | Zhen Lei | 2016-09-01 08:54:56 +0200 |
|---|---|---|
| committer | Will Deacon | 2016-09-09 15:59:08 +0200 |
| commit | 794224ea565c439ca624a3760ac220928463ea17 (patch) | |
| tree | 07e048febf683529c678f7cc488d2f388b06ee26 /arch | |
| parent | of/numa: remove a duplicated warning (diff) | |
| download | kernel-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')
| -rw-r--r-- | arch/arm64/kernel/acpi_numa.c | 4 | ||||
| -rw-r--r-- | arch/arm64/mm/numa.c | 6 |
2 files changed, 6 insertions, 4 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; } diff --git a/arch/arm64/mm/numa.c b/arch/arm64/mm/numa.c index 5bb15eab6f00..d97c6e246fb2 100644 --- a/arch/arm64/mm/numa.c +++ b/arch/arm64/mm/numa.c @@ -335,8 +335,10 @@ static int __init numa_init(int (*init_func)(void)) if (ret < 0) return ret; - if (nodes_empty(numa_nodes_parsed)) + if (nodes_empty(numa_nodes_parsed)) { + pr_info("No NUMA configuration found\n"); return -EINVAL; + } ret = numa_register_nodes(); if (ret < 0) @@ -367,8 +369,6 @@ static int __init dummy_numa_init(void) if (numa_off) pr_info("NUMA disabled\n"); /* Forced off on command line. */ - else - pr_info("No NUMA configuration found\n"); pr_info("NUMA: Faking a node at [mem %#018Lx-%#018Lx]\n", 0LLU, PFN_PHYS(max_pfn) - 1); |