summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/smpboot_32.c
diff options
context:
space:
mode:
authorGlauber de Oliveira Costa <gcosta@redhat.com>2008-03-19 18:26:01 +0100
committerIngo Molnar <mingo@elte.hu>2008-04-17 17:41:03 +0200
commita8db8453ff52609b14716361651ad10d2ab66682 (patch)
tree1356ff182b2399c391a1ac90a7828910ed108259 /arch/x86/kernel/smpboot_32.c
parentx86: integrate start_secondary (diff)
downloadlinux-a8db8453ff52609b14716361651ad10d2ab66682.tar.xz
linux-a8db8453ff52609b14716361651ad10d2ab66682.zip
x86: merge smp_prepare_boot_cpu
it is practically the same between arches now, so it is moved to smpboot.c. Minor differences (gdt initialization) live inside an ifdef Signed-off-by: Glauber Costa <gcosta@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/smpboot_32.c')
-rw-r--r--arch/x86/kernel/smpboot_32.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/arch/x86/kernel/smpboot_32.c b/arch/x86/kernel/smpboot_32.c
index 77b045cfebd4..5d27b1db6c26 100644
--- a/arch/x86/kernel/smpboot_32.c
+++ b/arch/x86/kernel/smpboot_32.c
@@ -77,9 +77,6 @@ u8 apicid_2_node[MAX_APICID];
extern void map_cpu_to_logical_apicid(void);
extern void unmap_cpu_to_logical_apicid(int cpu);
-/* State of each CPU. */
-DEFINE_PER_CPU(int, cpu_state) = { 0 };
-
#ifdef CONFIG_HOTPLUG_CPU
void cpu_exit_clear(void)
{
@@ -219,17 +216,6 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus)
smp_boot_cpus(max_cpus);
}
-void __init native_smp_prepare_boot_cpu(void)
-{
- unsigned int cpu = smp_processor_id();
-
- init_gdt(cpu);
- switch_to_new_gdt();
-
- cpu_set(cpu, cpu_callout_map);
- __get_cpu_var(cpu_state) = CPU_ONLINE;
-}
-
extern void impress_friends(void);
extern void smp_checks(void);