diff options
Diffstat (limited to 'arch/x86/kernel/setup.c')
-rw-r--r-- | arch/x86/kernel/setup.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index d5de157b02ae..f52a6fb90238 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c | |||
@@ -810,10 +810,6 @@ void __init setup_arch(char **cmdline_p) | |||
810 | */ | 810 | */ |
811 | acpi_boot_init(); | 811 | acpi_boot_init(); |
812 | 812 | ||
813 | #ifdef CONFIG_X86_64 | ||
814 | init_cpu_to_node(); | ||
815 | #endif | ||
816 | |||
817 | #if defined(CONFIG_X86_MPPARSE) || defined(CONFIG_X86_VISWS) | 813 | #if defined(CONFIG_X86_MPPARSE) || defined(CONFIG_X86_VISWS) |
818 | /* | 814 | /* |
819 | * get boot-time SMP configuration: | 815 | * get boot-time SMP configuration: |
@@ -822,6 +818,10 @@ void __init setup_arch(char **cmdline_p) | |||
822 | get_smp_config(); | 818 | get_smp_config(); |
823 | #endif | 819 | #endif |
824 | 820 | ||
821 | #ifdef CONFIG_X86_64 | ||
822 | init_cpu_to_node(); | ||
823 | #endif | ||
824 | |||
825 | init_apic_mappings(); | 825 | init_apic_mappings(); |
826 | ioapic_init_mappings(); | 826 | ioapic_init_mappings(); |
827 | 827 | ||