Commit fab334c1 authored by Yinghai Lu's avatar Yinghai Lu Committed by Ingo Molnar
Browse files

x86: cpu/common*.c, merge switch_to_new_gdt() 



Signed-off-by: default avatarYinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 1ba76586

arch/x86/kernel/cpu/common.c

+2 −0
Original line number Diff line number Diff line
@@ -215,7 +215,9 @@ void switch_to_new_gdt(void) 
	gdt_descr.address = (long)get_cpu_gdt_table(smp_processor_id());

	gdt_descr.size = GDT_SIZE - 1;

	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] = {};

arch/x86/kernel/cpu/common_64.c

+3 −0
Original line number Diff line number Diff line
@@ -214,6 +214,9 @@ void switch_to_new_gdt(void) 
	gdt_descr.address = (long)get_cpu_gdt_table(smp_processor_id());

	gdt_descr.size = GDT_SIZE - 1;

	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] = {};