From: Glauber de Oliveira Costa Date: Wed, 19 Mar 2008 17:25:47 +0000 (-0300) Subject: x86: modify smp_callin in x86_64 to look like i386 X-Git-Tag: v2.6.26-rc1~1154^2~350 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=ea0cadbfed09674bcc2b3e1e7f2d7317ddde4e95;p=linux-2.6-omap-h63xx.git x86: modify smp_callin in x86_64 to look like i386 We introduce empty macros just to make them look like the same Signed-off-by: Glauber Costa Signed-off-by: Ingo Molnar --- diff --git a/arch/x86/kernel/smpboot_64.c b/arch/x86/kernel/smpboot_64.c index b9384b3af01..e93fff42ec3 100644 --- a/arch/x86/kernel/smpboot_64.c +++ b/arch/x86/kernel/smpboot_64.c @@ -90,6 +90,9 @@ struct task_struct *idle_thread_array[NR_CPUS] __cpuinitdata ; static atomic_t init_deasserted __cpuinitdata; +#define smp_callin_clear_local_apic() do {} while (0) +#define map_cpu_to_logical_apicid() do {} while (0) + /* * Report back to the Boot Processor. * Running on AP. @@ -152,8 +155,10 @@ void __cpuinit smp_callin(void) */ Dprintk("CALLIN, before setup_local_APIC().\n"); + smp_callin_clear_local_apic(); setup_local_APIC(); end_local_APIC_setup(); + map_cpu_to_logical_apicid(); /* * Get our bogomips.