diff options
| author | Yinghai Lu <yinghai@kernel.org> | 2011-01-21 15:29:54 -0800 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-01-26 08:44:50 +0100 |
| commit | 792363d2beceb1c7d865e517fa9939c8b8c1442a (patch) | |
| tree | 734b361838e080231bf1d91a559be0dc6f5aad23 /arch/x86/kernel/smpboot.c | |
| parent | b3d7336db553d318e7ec042eb50a70d307013339 (diff) | |
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@kernel.org>
Cc: Suresh Siddha <suresh.b.siddha@intel.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
LKML-Reference: <4D3A16F2.5090902@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/smpboot.c')
| -rw-r--r-- | 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 d396155f436..a7a3d1acc63 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 |