Commit 52338088 authored by Anshuman Khandual's avatar Anshuman Khandual Committed by Catalin Marinas

arm64/numa: Unify common error path in numa_init()

At present numa_free_distance() is being called before numa_distance is
even initialized with numa_alloc_distance() which is really pointless.
Instead lets call numa_free_distance() on the common error path inside
numa_init() after numa_alloc_distance() has been successful.

Fixes: 1a2db300 ("arm64, numa: Add NUMA support for arm64 platforms")
Acked-by: default avatarPunit Agrawal <punit.agrawal@arm.com>
Signed-off-by: default avatarAnshuman Khandual <anshuman.khandual@arm.com>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent 77cfe950
...@@ -391,7 +391,6 @@ static int __init numa_init(int (*init_func)(void)) ...@@ -391,7 +391,6 @@ static int __init numa_init(int (*init_func)(void))
nodes_clear(numa_nodes_parsed); nodes_clear(numa_nodes_parsed);
nodes_clear(node_possible_map); nodes_clear(node_possible_map);
nodes_clear(node_online_map); nodes_clear(node_online_map);
numa_free_distance();
ret = numa_alloc_distance(); ret = numa_alloc_distance();
if (ret < 0) if (ret < 0)
...@@ -399,20 +398,24 @@ static int __init numa_init(int (*init_func)(void)) ...@@ -399,20 +398,24 @@ static int __init numa_init(int (*init_func)(void))
ret = init_func(); ret = init_func();
if (ret < 0) if (ret < 0)
return ret; goto out_free_distance;
if (nodes_empty(numa_nodes_parsed)) { if (nodes_empty(numa_nodes_parsed)) {
pr_info("No NUMA configuration found\n"); pr_info("No NUMA configuration found\n");
return -EINVAL; ret = -EINVAL;
goto out_free_distance;
} }
ret = numa_register_nodes(); ret = numa_register_nodes();
if (ret < 0) if (ret < 0)
return ret; goto out_free_distance;
setup_node_to_cpumask_map(); setup_node_to_cpumask_map();
return 0; return 0;
out_free_distance:
numa_free_distance();
return ret;
} }
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment