dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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: 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:
Tejun Heo 2011-02-16 12:13:07 +01:00
parent 206e42087a
commit 1909554870
5 changed files with 10 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/include/asm/acpi.h
View File

@ -185,8 +185,6 @@ struct bootnode;
#ifdef CONFIG_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 acpi_scan_nodes(void);
#define NR_NODE_MEMBLKS (MAX_NUMNODES*2)

1
arch/x86/include/asm/amd_nb.h
View File

@ -23,7 +23,6 @@ extern int amd_set_subcaches(int, int);
#ifdef CONFIG_NUMA_EMU
extern void amd_fake_nodes(const struct bootnode *nodes, int nr_nodes);
extern void amd_get_nodes(struct bootnode *nodes);
#endif
struct amd_northbridge {

10
arch/x86/mm/amdtopology_64.c
View File

@ -204,16 +204,6 @@ static s16 fake_apicid_to_node[MAX_LOCAL_APIC] __initdata = {
[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)
{
int ret = NUMA_NO_NODE;

23
arch/x86/mm/numa_64.c
View File

@ -257,21 +257,18 @@ void __init numa_emu_cmdline(char *str)
cmdline = str;
}
static int __init setup_physnodes(unsigned long start, unsigned long end,
int acpi, int amd)
static int __init setup_physnodes(unsigned long start, unsigned long end)
{
int ret = 0;
int i;
memset(physnodes, 0, sizeof(physnodes));
#ifdef CONFIG_ACPI_NUMA
if (acpi)
acpi_get_nodes(physnodes, start, end);
#endif
#ifdef CONFIG_AMD_NUMA
if (amd)
amd_get_nodes(physnodes);
#endif
for_each_node_mask(i, mem_nodes_parsed) {
physnodes[i].start = numa_nodes[i].start;
physnodes[i].end = numa_nodes[i].end;
}
/*
* 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=
@ -594,7 +591,7 @@ static int __init numa_emulation(unsigned long start_pfn,
init_memory_mapping_high();
for_each_node_mask(i, node_possible_map)
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);
numa_init_array();
return 0;
@ -666,10 +663,10 @@ void __init initmem_init(void)
cutoff_node(j, 0, max_pfn << PAGE_SHIFT);
#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))
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_online_map);
#endif

13
arch/x86/mm/srat_64.c
View File

@ -323,19 +323,6 @@ static int __init nodes_cover_memory(const struct bootnode *nodes)
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 ret;