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>

diff --git a/arch/x86/include/asm/acpi.h b/arch/x86/include/asm/acpi.h
index 12bd1fdd206b041831275edb7a81120214fc5a67..cfa3d5c3144a0737f1916650e722b93828dd1530 100644 (file)
--- a/arch/x86/include/asm/acpi.h
+++ b/arch/x86/include/asm/acpi.h
@@ -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,

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

diff --git a/arch/x86/mm/amdtopology_64.c b/arch/x86/mm/amdtopology_64.c
index 9c9f46adf414eab9e0119133c750f92d9516e279..90cf297b3b599beda820f1609994343768d4219a 100644 (file)
--- a/arch/x86/mm/amdtopology_64.c
+++ b/arch/x86/mm/amdtopology_64.c
@@ -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;
-}

diff --git a/arch/x86/mm/numa_64.c b/arch/x86/mm/numa_64.c
index 748c6b5bff6d5b484743cef437af2dfd696e1fee..e211c005f5e131d533f41fd60c0d9fa2d577e459 100644 (file)
--- a/arch/x86/mm/numa_64.c
+++ b/arch/x86/mm/numa_64.c
@@ -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);
 

diff --git a/arch/x86/mm/srat_64.c b/arch/x86/mm/srat_64.c
index 4a2c33b0a48c3bb469eac011b51bbe73b7f73f77..d56eff811cd8a94f00b039305f68614a53c5b8fc 100644 (file)
--- a/arch/x86/mm/srat_64.c
+++ b/arch/x86/mm/srat_64.c
@@ -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