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>
This commit is contained in:
parent
9787ed6e5c
commit
794224ea56
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
Loading…
Reference in a new issue