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

Commit 19095548 authored by Tejun Heo's avatar Tejun Heo
Browse files

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



With common numa_nodes[], common code in numa_64.c can access it
directly.  Copy directly and kill {acpi|amd}_get_nodes().

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 206e4208

arch/x86/include/asm/acpi.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -185,8 +185,6 @@ struct bootnode; 




#ifdef CONFIG_ACPI_NUMA

#ifdef CONFIG_ACPI_NUMA

extern int acpi_numa;

extern int acpi_numa;

extern void acpi_get_nodes(struct bootnode *physnodes, unsigned long start,

				unsigned long end);

extern int x86_acpi_numa_init(void);

extern int x86_acpi_numa_init(void);

extern int acpi_scan_nodes(void);

extern int acpi_scan_nodes(void);

#define NR_NODE_MEMBLKS (MAX_NUMNODES*2)

#define NR_NODE_MEMBLKS (MAX_NUMNODES*2)

arch/x86/include/asm/amd_nb.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -23,7 +23,6 @@ extern int amd_set_subcaches(int, int); 




#ifdef CONFIG_NUMA_EMU

#ifdef CONFIG_NUMA_EMU

extern void amd_fake_nodes(const struct bootnode *nodes, int nr_nodes);

extern void amd_fake_nodes(const struct bootnode *nodes, int nr_nodes);

extern void amd_get_nodes(struct bootnode *nodes);

#endif

#endif





struct amd_northbridge {

struct amd_northbridge {

arch/x86/mm/amdtopology_64.c

+0 −10
Original line number Original line Diff line number Diff line
@@ -204,16 +204,6 @@ static s16 fake_apicid_to_node[MAX_LOCAL_APIC] __initdata = { 
	[0 ... MAX_LOCAL_APIC-1] = NUMA_NO_NODE

	[0 ... MAX_LOCAL_APIC-1] = NUMA_NO_NODE

};

};





void __init amd_get_nodes(struct bootnode *physnodes)

{

	int i;



	for_each_node_mask(i, mem_nodes_parsed) {

		physnodes[i].start = numa_nodes[i].start;

		physnodes[i].end = numa_nodes[i].end;

	}

}



static int __init find_node_by_addr(unsigned long addr)

static int __init find_node_by_addr(unsigned long addr)

{

{

	int ret = NUMA_NO_NODE;

	int ret = NUMA_NO_NODE;

arch/x86/mm/numa_64.c

+10 −13
Original line number Original line Diff line number Diff line
@@ -257,21 +257,18 @@ void __init numa_emu_cmdline(char *str) 
	cmdline = str;

	cmdline = str;

}

}





static int __init setup_physnodes(unsigned long start, unsigned long end,

static int __init setup_physnodes(unsigned long start, unsigned long end)

					int acpi, int amd)

{

{

	int ret = 0;

	int ret = 0;

	int i;

	int i;





	memset(physnodes, 0, sizeof(physnodes));

	memset(physnodes, 0, sizeof(physnodes));

#ifdef CONFIG_ACPI_NUMA



	if (acpi)

	for_each_node_mask(i, mem_nodes_parsed) {

		acpi_get_nodes(physnodes, start, end);

		physnodes[i].start = numa_nodes[i].start;

#endif

		physnodes[i].end = numa_nodes[i].end;

#ifdef CONFIG_AMD_NUMA

	}

	if (amd)



		amd_get_nodes(physnodes);

#endif

	/*

	/*

	 * Basic sanity checking on the physical node map: there may be errors

	 * Basic sanity checking on the physical node map: there may be errors

	 * if the SRAT or AMD code incorrectly reported the topology or the mem=

	 * if the SRAT or AMD code incorrectly reported the topology or the mem=
@@ -594,7 +591,7 @@ static int __init numa_emulation(unsigned long start_pfn, 
	init_memory_mapping_high();

	init_memory_mapping_high();

	for_each_node_mask(i, node_possible_map)

	for_each_node_mask(i, node_possible_map)

		setup_node_bootmem(i, nodes[i].start, nodes[i].end);

		setup_node_bootmem(i, nodes[i].start, nodes[i].end);

	setup_physnodes(addr, max_addr, acpi, amd);

	setup_physnodes(addr, max_addr);

	fake_physnodes(acpi, amd, num_nodes);

	fake_physnodes(acpi, amd, num_nodes);

	numa_init_array();

	numa_init_array();

	return 0;

	return 0;
@@ -666,10 +663,10 @@ void __init initmem_init(void) 
			cutoff_node(j, 0, max_pfn << PAGE_SHIFT);

			cutoff_node(j, 0, max_pfn << PAGE_SHIFT);





#ifdef CONFIG_NUMA_EMU

#ifdef CONFIG_NUMA_EMU

		setup_physnodes(0, max_pfn << PAGE_SHIFT, i == 0, i == 1);

		setup_physnodes(0, max_pfn << PAGE_SHIFT);

		if (cmdline && !numa_emulation(0, max_pfn, i == 0, i == 1))

		if (cmdline && !numa_emulation(0, max_pfn, i == 0, i == 1))

			return;

			return;

		setup_physnodes(0, max_pfn << PAGE_SHIFT, i == 0, i == 1);

		setup_physnodes(0, max_pfn << PAGE_SHIFT);

		nodes_clear(node_possible_map);

		nodes_clear(node_possible_map);

		nodes_clear(node_online_map);

		nodes_clear(node_online_map);

#endif

#endif

arch/x86/mm/srat_64.c

+0 −13
Original line number Original line Diff line number Diff line
@@ -323,19 +323,6 @@ static int __init nodes_cover_memory(const struct bootnode *nodes) 




void __init acpi_numa_arch_fixup(void) {}

void __init acpi_numa_arch_fixup(void) {}





#ifdef CONFIG_NUMA_EMU

void __init acpi_get_nodes(struct bootnode *physnodes, unsigned long start,

				unsigned long end)

{

	int i;



	for_each_node_mask(i, mem_nodes_parsed) {

		physnodes[i].start = numa_nodes[i].start;

		physnodes[i].end = numa_nodes[i].end;

	}

}

#endif /* CONFIG_NUMA_EMU */



int __init x86_acpi_numa_init(void)

int __init x86_acpi_numa_init(void)

{

{

	int ret;

	int ret;