Commit-ID: 792363d2beceb1c7d865e517fa9939c8b8c1442a Gitweb: http://git.kernel.org/tip/792363d2beceb1c7d865e517fa9939c8b8c1442a Author: Yinghai Lu <yinghai@xxxxxxxxxx> AuthorDate: Fri, 21 Jan 2011 15:29:54 -0800 Committer: Ingo Molnar <mingo@xxxxxxx> CommitDate: Wed, 26 Jan 2011 08:44:50 +0100 x86: Don't copy per_cpu cpuinfo for BSP two times smp_store_cpu_info(0) will do that. Signed-off-by: Yinghai Lu <yinghai@xxxxxxxxxx> Cc: Suresh Siddha <suresh.b.siddha@xxxxxxxxx> Cc: Tejun Heo <tj@xxxxxxxxxx> Cc: Borislav Petkov <bp@xxxxxxxxx> LKML-Reference: <4D3A16F2.5090902@xxxxxxxxxx> Signed-off-by: Ingo Molnar <mingo@xxxxxxx> --- arch/x86/kernel/smpboot.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index d396155..a7a3d1a 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -1071,13 +1071,13 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus) preempt_disable(); smp_cpu_index_default(); - memcpy(__this_cpu_ptr(&cpu_info), &boot_cpu_data, sizeof(cpu_info)); - cpumask_copy(cpu_callin_mask, cpumask_of(0)); - mb(); + /* * Setup boot CPU information */ smp_store_cpu_info(0); /* Final full version of the data */ + cpumask_copy(cpu_callin_mask, cpumask_of(0)); + mb(); #ifdef CONFIG_X86_32 boot_cpu_logical_apicid = logical_smp_processor_id(); #endif -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|