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>

diff --git a/arch/x86/include/asm/acpi.h b/arch/x86/include/asm/acpi.h
index 06fb7865eff2a630d87e6dc1d4bef996e8b30d69..446a5b9a1d5f3515777f60d9172e6df468f73d07 100644 (file)
--- a/arch/x86/include/asm/acpi.h
+++ b/arch/x86/include/asm/acpi.h
@@ -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)

diff --git a/arch/x86/include/asm/amd_nb.h b/arch/x86/include/asm/amd_nb.h
index dc3c6e34da1d3f178f96038a5ad066482dcc47e6..246cdc6ca9ba8f7eef3534620fe877cf4e87115a 100644 (file)
--- a/arch/x86/include/asm/amd_nb.h
+++ b/arch/x86/include/asm/amd_nb.h
@@ -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 {

diff --git a/arch/x86/mm/amdtopology_64.c b/arch/x86/mm/amdtopology_64.c
index f049fa67ed731e88df39e467208b7c198d129761..cf29527885f8295d10052dfd1db174e547826b13 100644 (file)
--- a/arch/x86/mm/amdtopology_64.c
+++ b/arch/x86/mm/amdtopology_64.c
@@ -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;

diff --git a/arch/x86/mm/numa_64.c b/arch/x86/mm/numa_64.c
index a6b899f7ddd2bf278c909843934931664f6050db..82ee3083b0949889df4b2a630b43b6c61dc216e1 100644 (file)
--- a/arch/x86/mm/numa_64.c
+++ b/arch/x86/mm/numa_64.c
@@ -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

diff --git a/arch/x86/mm/srat_64.c b/arch/x86/mm/srat_64.c
index bfa4a6af5cfe5574d3de5135ac516bdf68cefa7c..82b1087963a26d5fd98a28dce529cc9c5dc9372f 100644 (file)
--- a/arch/x86/mm/srat_64.c
+++ b/arch/x86/mm/srat_64.c
@@ -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;