Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d371b08 authored by Tejun Heo's avatar Tejun Heo
Browse files

x86-64, NUMA: Kill {acpi|amd|dummy}_scan_nodes() 



They are empty now.  Kill them.

Signed-off-by: default avatarTejun 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>
parent fd0435d8

arch/x86/include/asm/acpi.h

+0 −1
Original line number Diff line number Diff line
@@ -186,7 +186,6 @@ struct bootnode; 
#ifdef CONFIG_ACPI_NUMA

extern int acpi_numa;

extern int x86_acpi_numa_init(void);

extern int acpi_scan_nodes(void);



#ifdef CONFIG_NUMA_EMU

extern void acpi_fake_nodes(const struct bootnode *fake_nodes,

arch/x86/include/asm/amd_nb.h

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ extern int early_is_amd_nb(u32 value); 
extern int amd_cache_northbridges(void);

extern void amd_flush_garts(void);

extern int amd_numa_init(void);

extern int amd_scan_nodes(void);

extern int amd_get_subcaches(int);

extern int amd_set_subcaches(int, int);

arch/x86/mm/amdtopology_64.c

+0 −5
Original line number Diff line number Diff line
@@ -259,8 +259,3 @@ void __init amd_fake_nodes(const struct bootnode *nodes, int nr_nodes) 
	memcpy(__apicid_to_node, fake_apicid_to_node, sizeof(__apicid_to_node));

}

#endif /* CONFIG_NUMA_EMU */
 


int __init amd_scan_nodes(void)

{

	return 0;

}

arch/x86/mm/numa_64.c

+0 −11
Original line number Diff line number Diff line
@@ -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);

arch/x86/mm/srat_64.c

+0 −8
Original line number Diff line number Diff line
@@ -270,14 +270,6 @@ int __init x86_acpi_numa_init(void) 
	return srat_disabled() ? -EINVAL : 0;

}



/* Use the information discovered above to actually set up the nodes. */

int __init acpi_scan_nodes(void)

{

	if (acpi_numa <= 0)

		return -1;

	return 0;

}



#ifdef CONFIG_NUMA_EMU

static int fake_node_to_pxm_map[MAX_NUMNODES] __initdata = {

	[0 ... MAX_NUMNODES-1] = PXM_INVAL