9939ddaff5
Now that pda is allocated as part of percpu, percpu doesn't need to be accessed through pda. Unify x86_64 SMP percpu access with x86_32 SMP one. Other than the segment register, operand size and the base of percpu symbols, they behave identical now. This patch replaces now unnecessary pda->data_offset with a dummy field which is necessary to keep stack_canary at its place. This patch also moves per_cpu_offset initialization out of init_gdt() into setup_per_cpu_areas(). Note that this change also necessitates explicit per_cpu_offset initializations in voyager_smp.c. With this change, x86_OP_percpu()'s are as efficient on x86_64 as on x86_32 and also x86_64 can use assembly PER_CPU macros. Signed-off-by: Tejun Heo <tj@kernel.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
30 lines
676 B
C
30 lines
676 B
C
/*
|
|
* SMP stuff which is common to all sub-architectures.
|
|
*/
|
|
#include <linux/module.h>
|
|
#include <asm/smp.h>
|
|
|
|
DEFINE_PER_CPU(unsigned long, this_cpu_off);
|
|
EXPORT_PER_CPU_SYMBOL(this_cpu_off);
|
|
|
|
#ifdef CONFIG_X86_32
|
|
/*
|
|
* Initialize the CPU's GDT. This is either the boot CPU doing itself
|
|
* (still using the master per-cpu area), or a CPU doing it for a
|
|
* secondary which will soon come up.
|
|
*/
|
|
__cpuinit void init_gdt(int cpu)
|
|
{
|
|
struct desc_struct gdt;
|
|
|
|
pack_descriptor(&gdt, __per_cpu_offset[cpu], 0xFFFFF,
|
|
0x2 | DESCTYPE_S, 0x8);
|
|
gdt.s = 1;
|
|
|
|
write_gdt_entry(get_cpu_gdt_table(cpu),
|
|
GDT_ENTRY_PERCPU, &gdt, DESCTYPE_S);
|
|
|
|
per_cpu(cpu_number, cpu) = cpu;
|
|
}
|
|
#endif
|