aboutsummaryrefslogtreecommitdiffstats
path: root/arch/i386/kernel/smpboot.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/i386/kernel/smpboot.c')
-rw-r--r--arch/i386/kernel/smpboot.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/i386/kernel/smpboot.c b/arch/i386/kernel/smpboot.c
index b0ad04d9ef21..1c3ad9b406ca 100644
--- a/arch/i386/kernel/smpboot.c
+++ b/arch/i386/kernel/smpboot.c
@@ -1171,7 +1171,7 @@ static void __init smp_boot_cpus(unsigned int max_cpus)
1171 1171
1172/* These are wrappers to interface to the new boot process. Someone 1172/* These are wrappers to interface to the new boot process. Someone
1173 who understands all this stuff should rewrite it properly. --RR 15/Jul/02 */ 1173 who understands all this stuff should rewrite it properly. --RR 15/Jul/02 */
1174void __init smp_prepare_cpus(unsigned int max_cpus) 1174void __init native_smp_prepare_cpus(unsigned int max_cpus)
1175{ 1175{
1176 smp_commenced_mask = cpumask_of_cpu(0); 1176 smp_commenced_mask = cpumask_of_cpu(0);
1177 cpu_callin_map = cpumask_of_cpu(0); 1177 cpu_callin_map = cpumask_of_cpu(0);
@@ -1191,7 +1191,7 @@ static inline void switch_to_new_gdt(void)
1191 asm volatile ("mov %0, %%fs" : : "r" (__KERNEL_PDA) : "memory"); 1191 asm volatile ("mov %0, %%fs" : : "r" (__KERNEL_PDA) : "memory");
1192} 1192}
1193 1193
1194void __init smp_prepare_boot_cpu(void) 1194void __init native_smp_prepare_boot_cpu(void)
1195{ 1195{
1196 unsigned int cpu = smp_processor_id(); 1196 unsigned int cpu = smp_processor_id();
1197 1197
@@ -1292,7 +1292,7 @@ void __cpu_die(unsigned int cpu)
1292} 1292}
1293#endif /* CONFIG_HOTPLUG_CPU */ 1293#endif /* CONFIG_HOTPLUG_CPU */
1294 1294
1295int __cpuinit __cpu_up(unsigned int cpu) 1295int __cpuinit native_cpu_up(unsigned int cpu)
1296{ 1296{
1297 unsigned long flags; 1297 unsigned long flags;
1298#ifdef CONFIG_HOTPLUG_CPU 1298#ifdef CONFIG_HOTPLUG_CPU
@@ -1337,7 +1337,7 @@ int __cpuinit __cpu_up(unsigned int cpu)
1337 return 0; 1337 return 0;
1338} 1338}
1339 1339
1340void __init smp_cpus_done(unsigned int max_cpus) 1340void __init native_smp_cpus_done(unsigned int max_cpus)
1341{ 1341{
1342#ifdef CONFIG_X86_IO_APIC 1342#ifdef CONFIG_X86_IO_APIC
1343 setup_ioapic_dest(); 1343 setup_ioapic_dest();