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/x86/mm/numa_64.c | |
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/x86/mm/numa_64.c')
-rw-r--r-- | arch/x86/mm/numa_64.c | 11 |
1 files changed, 0 insertions, 11 deletions
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 | ||