x86: cpu/common*.c, merge switch_to_new_gdt()
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
parent
1ba76586f7
commit
fab334c1d5
2 changed files with 5 additions and 0 deletions
|
@ -215,7 +215,9 @@ void switch_to_new_gdt(void)
|
||||||
gdt_descr.address = (long)get_cpu_gdt_table(smp_processor_id());
|
gdt_descr.address = (long)get_cpu_gdt_table(smp_processor_id());
|
||||||
gdt_descr.size = GDT_SIZE - 1;
|
gdt_descr.size = GDT_SIZE - 1;
|
||||||
load_gdt(&gdt_descr);
|
load_gdt(&gdt_descr);
|
||||||
|
#ifdef CONFIG_X86_32
|
||||||
asm("mov %0, %%fs" : : "r" (__KERNEL_PERCPU) : "memory");
|
asm("mov %0, %%fs" : : "r" (__KERNEL_PERCPU) : "memory");
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct cpu_dev *cpu_devs[X86_VENDOR_NUM] = {};
|
static struct cpu_dev *cpu_devs[X86_VENDOR_NUM] = {};
|
||||||
|
|
|
@ -214,6 +214,9 @@ void switch_to_new_gdt(void)
|
||||||
gdt_descr.address = (long)get_cpu_gdt_table(smp_processor_id());
|
gdt_descr.address = (long)get_cpu_gdt_table(smp_processor_id());
|
||||||
gdt_descr.size = GDT_SIZE - 1;
|
gdt_descr.size = GDT_SIZE - 1;
|
||||||
load_gdt(&gdt_descr);
|
load_gdt(&gdt_descr);
|
||||||
|
#ifdef CONFIG_X86_32
|
||||||
|
asm("mov %0, %%fs" : : "r" (__KERNEL_PERCPU) : "memory");
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct cpu_dev *cpu_devs[X86_VENDOR_NUM] = {};
|
static struct cpu_dev *cpu_devs[X86_VENDOR_NUM] = {};
|
||||||
|
|
Reference in a new issue