diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-08 05:59:23 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 05:59:23 -0400 |
commit | 2b4fa851b2f06fdb04cac808b57324f5e51e1578 (patch) | |
tree | 97db3ad5adda7683923630982f68b8b52c86e790 /arch/x86/kernel/setup_32.c | |
parent | 3de352bbd86f890dd0c5e1c09a6a1b0b29e0f8ce (diff) | |
parent | 46f68e1c6b04a04772e828ff3bcd07ed708805c2 (diff) |
Merge branch 'x86/numa' into x86/devel
Conflicts:
arch/x86/Kconfig
arch/x86/kernel/e820.c
arch/x86/kernel/efi_64.c
arch/x86/kernel/mpparse.c
arch/x86/kernel/setup.c
arch/x86/kernel/setup_32.c
arch/x86/mm/init_64.c
include/asm-x86/proto.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 7e06ecd83174..a9b19ad24edb 100644 --- a/arch/x86/kernel/setup_32.c +++ b/arch/x86/kernel/setup_32.c | |||
@@ -659,18 +659,6 @@ static void set_mca_bus(int x) | |||
659 | static void set_mca_bus(int x) { } | 659 | static void set_mca_bus(int x) { } |
660 | #endif | 660 | #endif |
661 | 661 | ||
662 | #ifdef CONFIG_NUMA | ||
663 | /* | ||
664 | * In the golden day, when everything among i386 and x86_64 will be | ||
665 | * integrated, this will not live here | ||
666 | */ | ||
667 | void *x86_cpu_to_node_map_early_ptr; | ||
668 | int x86_cpu_to_node_map_init[NR_CPUS] = { | ||
669 | [0 ... NR_CPUS-1] = NUMA_NO_NODE | ||
670 | }; | ||
671 | DEFINE_PER_CPU(int, x86_cpu_to_node_map) = NUMA_NO_NODE; | ||
672 | #endif | ||
673 | |||
674 | static void probe_roms(void); | 662 | static void probe_roms(void); |
675 | 663 | ||
676 | /* | 664 | /* |
@@ -866,18 +854,6 @@ void __init setup_arch(char **cmdline_p) | |||
866 | 854 | ||
867 | paravirt_post_allocator_init(); | 855 | paravirt_post_allocator_init(); |
868 | 856 | ||
869 | #ifdef CONFIG_X86_SMP | ||
870 | /* | ||
871 | * setup to use the early static init tables during kernel startup | ||
872 | * X86_SMP will exclude sub-arches that don't deal well with it. | ||
873 | */ | ||
874 | x86_cpu_to_apicid_early_ptr = (void *)x86_cpu_to_apicid_init; | ||
875 | x86_bios_cpu_apicid_early_ptr = (void *)x86_bios_cpu_apicid_init; | ||
876 | #ifdef CONFIG_NUMA | ||
877 | x86_cpu_to_node_map_early_ptr = (void *)x86_cpu_to_node_map_init; | ||
878 | #endif | ||
879 | #endif | ||
880 | |||
881 | #ifdef CONFIG_X86_GENERICARCH | 857 | #ifdef CONFIG_X86_GENERICARCH |
882 | generic_apic_probe(); | 858 | generic_apic_probe(); |
883 | #endif | 859 | #endif |