x86-64, NUMA: Kill {acpi|amd|dummy}_scan_nodes()
They are empty now. Kill them. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Yinghai Lu <yinghai@kernel.org> Cc: Brian Gerst <brgerst@gmail.com> Cc: Cyrill Gorcunov <gorcunov@gmail.com> Cc: Shaohui Zheng <shaohui.zheng@intel.com> Cc: David Rientjes <rientjes@google.com> Cc: Ingo Molnar <mingo@elte.hu> Cc: H. Peter Anvin <hpa@linux.intel.com>
This commit is contained in:
@ -772,25 +772,17 @@ static int dummy_numa_init(void)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int dummy_scan_nodes(void)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
void __init initmem_init(void)
|
||||
{
|
||||
int (*numa_init[])(void) = { [2] = dummy_numa_init };
|
||||
int (*scan_nodes[])(void) = { [2] = dummy_scan_nodes };
|
||||
int i, j;
|
||||
|
||||
if (!numa_off) {
|
||||
#ifdef CONFIG_ACPI_NUMA
|
||||
numa_init[0] = x86_acpi_numa_init;
|
||||
scan_nodes[0] = acpi_scan_nodes;
|
||||
#endif
|
||||
#ifdef CONFIG_AMD_NUMA
|
||||
numa_init[1] = amd_numa_init;
|
||||
scan_nodes[1] = amd_scan_nodes;
|
||||
#endif
|
||||
}
|
||||
|
||||
@ -834,9 +826,6 @@ void __init initmem_init(void)
|
||||
if (numa_register_memblks() < 0)
|
||||
continue;
|
||||
|
||||
if (scan_nodes[i]() < 0)
|
||||
continue;
|
||||
|
||||
for (j = 0; j < nr_cpu_ids; j++) {
|
||||
int nid = early_cpu_to_node(j);
|
||||
|
||||
|
Reference in New Issue
Block a user