diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-05-07 13:52:16 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-05-07 13:52:16 +1000 |
commit | bcb1b8c75e30e9c39b6f162cffe59df9caaf27e4 (patch) | |
tree | 4ab3f05bc3ef51b1296ca7a00ef7acdb7428e6f6 /arch/x86/kernel/setup_64.c | |
parent | f3636bd721198538840ec33389001280c3bd7452 (diff) | |
parent | 553e3cc6fd94d3924617f1b36614606f12211219 (diff) |
Merge commit 'sched-latest/latest'
Conflicts:
include/linux/stop_machine.h
kernel/stop_machine.c
Diffstat (limited to 'arch/x86/kernel/setup_64.c')
-rw-r--r-- | arch/x86/kernel/setup_64.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/x86/kernel/setup_64.c b/arch/x86/kernel/setup_64.c index bee7a7195aa0..1f2a55e19ccc 100644 --- a/arch/x86/kernel/setup_64.c +++ b/arch/x86/kernel/setup_64.c @@ -394,15 +394,6 @@ void __init setup_arch(char **cmdline_p) kvmclock_init(); #endif -#ifdef CONFIG_SMP - /* setup to use the early static init tables during kernel startup */ - x86_cpu_to_apicid_early_ptr = (void *)x86_cpu_to_apicid_init; - x86_bios_cpu_apicid_early_ptr = (void *)x86_bios_cpu_apicid_init; -#ifdef CONFIG_NUMA - x86_cpu_to_node_map_early_ptr = (void *)x86_cpu_to_node_map_init; -#endif -#endif - #ifdef CONFIG_ACPI /* * Initialize the ACPI boot-time table parser (gets the RSDP and SDT). |