diff options
Diffstat (limited to 'arch/x86/kernel/setup_32.c')
-rw-r--r-- | arch/x86/kernel/setup_32.c | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/arch/x86/kernel/setup_32.c b/arch/x86/kernel/setup_32.c index 5a2f8e06388..ccd5f5cdbbe 100644 --- a/arch/x86/kernel/setup_32.c +++ b/arch/x86/kernel/setup_32.c | |||
@@ -737,18 +737,6 @@ char * __init __attribute__((weak)) memory_setup(void) | |||
737 | return machine_specific_memory_setup(); | 737 | return machine_specific_memory_setup(); |
738 | } | 738 | } |
739 | 739 | ||
740 | #ifdef CONFIG_NUMA | ||
741 | /* | ||
742 | * In the golden day, when everything among i386 and x86_64 will be | ||
743 | * integrated, this will not live here | ||
744 | */ | ||
745 | void *x86_cpu_to_node_map_early_ptr; | ||
746 | int x86_cpu_to_node_map_init[NR_CPUS] = { | ||
747 | [0 ... NR_CPUS-1] = NUMA_NO_NODE | ||
748 | }; | ||
749 | DEFINE_PER_CPU(int, x86_cpu_to_node_map) = NUMA_NO_NODE; | ||
750 | #endif | ||
751 | |||
752 | /* | 740 | /* |
753 | * Determine if we were loaded by an EFI loader. If so, then we have also been | 741 | * Determine if we were loaded by an EFI loader. If so, then we have also been |
754 | * passed the efi memmap, systab, etc., so we should use these data structures | 742 | * passed the efi memmap, systab, etc., so we should use these data structures |
@@ -887,18 +875,6 @@ void __init setup_arch(char **cmdline_p) | |||
887 | 875 | ||
888 | io_delay_init(); | 876 | io_delay_init(); |
889 | 877 | ||
890 | #ifdef CONFIG_X86_SMP | ||
891 | /* | ||
892 | * setup to use the early static init tables during kernel startup | ||
893 | * X86_SMP will exclude sub-arches that don't deal well with it. | ||
894 | */ | ||
895 | x86_cpu_to_apicid_early_ptr = (void *)x86_cpu_to_apicid_init; | ||
896 | x86_bios_cpu_apicid_early_ptr = (void *)x86_bios_cpu_apicid_init; | ||
897 | #ifdef CONFIG_NUMA | ||
898 | x86_cpu_to_node_map_early_ptr = (void *)x86_cpu_to_node_map_init; | ||
899 | #endif | ||
900 | #endif | ||
901 | |||
902 | #ifdef CONFIG_X86_GENERICARCH | 878 | #ifdef CONFIG_X86_GENERICARCH |
903 | generic_apic_probe(); | 879 | generic_apic_probe(); |
904 | #endif | 880 | #endif |