diff options
author | Tejun Heo <tj@kernel.org> | 2011-02-16 11:11:08 -0500 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2011-02-16 11:11:08 -0500 |
commit | 5d371b08fea80c4fb7450d31e5a4e35b438ef850 (patch) | |
tree | d87e33c1b8b63bc7e50d7a5e18d0f12f8022582b /arch | |
parent | fd0435d8fb1d4e5771f9ae3af71f2a77c1f4bd09 (diff) |
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>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/include/asm/acpi.h | 1 | ||||
-rw-r--r-- | arch/x86/include/asm/amd_nb.h | 1 | ||||
-rw-r--r-- | arch/x86/mm/amdtopology_64.c | 5 | ||||
-rw-r--r-- | arch/x86/mm/numa_64.c | 11 | ||||
-rw-r--r-- | arch/x86/mm/srat_64.c | 8 |
5 files changed, 0 insertions, 26 deletions
diff --git a/arch/x86/include/asm/acpi.h b/arch/x86/include/asm/acpi.h index 12bd1fdd206b..cfa3d5c3144a 100644 --- a/arch/x86/include/asm/acpi.h +++ b/arch/x86/include/asm/acpi.h | |||
@@ -186,7 +186,6 @@ struct bootnode; | |||
186 | #ifdef CONFIG_ACPI_NUMA | 186 | #ifdef CONFIG_ACPI_NUMA |
187 | extern int acpi_numa; | 187 | extern int acpi_numa; |
188 | extern int x86_acpi_numa_init(void); | 188 | extern int x86_acpi_numa_init(void); |
189 | extern int acpi_scan_nodes(void); | ||
190 | 189 | ||
191 | #ifdef CONFIG_NUMA_EMU | 190 | #ifdef CONFIG_NUMA_EMU |
192 | extern void acpi_fake_nodes(const struct bootnode *fake_nodes, | 191 | 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 246cdc6ca9ba..384d1188e787 100644 --- 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); | |||
17 | extern int amd_cache_northbridges(void); | 17 | extern int amd_cache_northbridges(void); |
18 | extern void amd_flush_garts(void); | 18 | extern void amd_flush_garts(void); |
19 | extern int amd_numa_init(void); | 19 | extern int amd_numa_init(void); |
20 | extern int amd_scan_nodes(void); | ||
21 | extern int amd_get_subcaches(int); | 20 | extern int amd_get_subcaches(int); |
22 | extern int amd_set_subcaches(int, int); | 21 | extern int amd_set_subcaches(int, int); |
23 | 22 | ||
diff --git a/arch/x86/mm/amdtopology_64.c b/arch/x86/mm/amdtopology_64.c index 9c9f46adf414..90cf297b3b59 100644 --- 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) | |||
259 | memcpy(__apicid_to_node, fake_apicid_to_node, sizeof(__apicid_to_node)); | 259 | memcpy(__apicid_to_node, fake_apicid_to_node, sizeof(__apicid_to_node)); |
260 | } | 260 | } |
261 | #endif /* CONFIG_NUMA_EMU */ | 261 | #endif /* CONFIG_NUMA_EMU */ |
262 | |||
263 | int __init amd_scan_nodes(void) | ||
264 | { | ||
265 | return 0; | ||
266 | } | ||
diff --git a/arch/x86/mm/numa_64.c b/arch/x86/mm/numa_64.c index 748c6b5bff6d..e211c005f5e1 100644 --- a/arch/x86/mm/numa_64.c +++ b/arch/x86/mm/numa_64.c | |||
@@ -772,25 +772,17 @@ static int dummy_numa_init(void) | |||
772 | return 0; | 772 | return 0; |
773 | } | 773 | } |
774 | 774 | ||
775 | static int dummy_scan_nodes(void) | ||
776 | { | ||
777 | return 0; | ||
778 | } | ||
779 | |||
780 | void __init initmem_init(void) | 775 | void __init initmem_init(void) |
781 | { | 776 | { |
782 | int (*numa_init[])(void) = { [2] = dummy_numa_init }; | 777 | int (*numa_init[])(void) = { [2] = dummy_numa_init }; |
783 | int (*scan_nodes[])(void) = { [2] = dummy_scan_nodes }; | ||
784 | int i, j; | 778 | int i, j; |
785 | 779 | ||
786 | if (!numa_off) { | 780 | if (!numa_off) { |
787 | #ifdef CONFIG_ACPI_NUMA | 781 | #ifdef CONFIG_ACPI_NUMA |
788 | numa_init[0] = x86_acpi_numa_init; | 782 | numa_init[0] = x86_acpi_numa_init; |
789 | scan_nodes[0] = acpi_scan_nodes; | ||
790 | #endif | 783 | #endif |
791 | #ifdef CONFIG_AMD_NUMA | 784 | #ifdef CONFIG_AMD_NUMA |
792 | numa_init[1] = amd_numa_init; | 785 | numa_init[1] = amd_numa_init; |
793 | scan_nodes[1] = amd_scan_nodes; | ||
794 | #endif | 786 | #endif |
795 | } | 787 | } |
796 | 788 | ||
@@ -834,9 +826,6 @@ void __init initmem_init(void) | |||
834 | if (numa_register_memblks() < 0) | 826 | if (numa_register_memblks() < 0) |
835 | continue; | 827 | continue; |
836 | 828 | ||
837 | if (scan_nodes[i]() < 0) | ||
838 | continue; | ||
839 | |||
840 | for (j = 0; j < nr_cpu_ids; j++) { | 829 | for (j = 0; j < nr_cpu_ids; j++) { |
841 | int nid = early_cpu_to_node(j); | 830 | int nid = early_cpu_to_node(j); |
842 | 831 | ||
diff --git a/arch/x86/mm/srat_64.c b/arch/x86/mm/srat_64.c index 4a2c33b0a48c..d56eff811cd8 100644 --- 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) | |||
270 | return srat_disabled() ? -EINVAL : 0; | 270 | return srat_disabled() ? -EINVAL : 0; |
271 | } | 271 | } |
272 | 272 | ||
273 | /* Use the information discovered above to actually set up the nodes. */ | ||
274 | int __init acpi_scan_nodes(void) | ||
275 | { | ||
276 | if (acpi_numa <= 0) | ||
277 | return -1; | ||
278 | return 0; | ||
279 | } | ||
280 | |||
281 | #ifdef CONFIG_NUMA_EMU | 273 | #ifdef CONFIG_NUMA_EMU |
282 | static int fake_node_to_pxm_map[MAX_NUMNODES] __initdata = { | 274 | static int fake_node_to_pxm_map[MAX_NUMNODES] __initdata = { |
283 | [0 ... MAX_NUMNODES-1] = PXM_INVAL | 275 | [0 ... MAX_NUMNODES-1] = PXM_INVAL |