aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/cpu/common.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/kernel/cpu/common.c')
-rw-r--r--arch/x86/kernel/cpu/common.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index 2346c95c6ab1..5d0f0cc7ea26 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -979,7 +979,7 @@ static void syscall32_cpu_init(void)
979void enable_sep_cpu(void) 979void enable_sep_cpu(void)
980{ 980{
981 int cpu = get_cpu(); 981 int cpu = get_cpu();
982 struct tss_struct *tss = &per_cpu(init_tss, cpu); 982 struct tss_struct *tss = &per_cpu(cpu_tss, cpu);
983 983
984 if (!boot_cpu_has(X86_FEATURE_SEP)) { 984 if (!boot_cpu_has(X86_FEATURE_SEP)) {
985 put_cpu(); 985 put_cpu();
@@ -1307,7 +1307,7 @@ void cpu_init(void)
1307 */ 1307 */
1308 load_ucode_ap(); 1308 load_ucode_ap();
1309 1309
1310 t = &per_cpu(init_tss, cpu); 1310 t = &per_cpu(cpu_tss, cpu);
1311 oist = &per_cpu(orig_ist, cpu); 1311 oist = &per_cpu(orig_ist, cpu);
1312 1312
1313#ifdef CONFIG_NUMA 1313#ifdef CONFIG_NUMA
@@ -1391,7 +1391,7 @@ void cpu_init(void)
1391{ 1391{
1392 int cpu = smp_processor_id(); 1392 int cpu = smp_processor_id();
1393 struct task_struct *curr = current; 1393 struct task_struct *curr = current;
1394 struct tss_struct *t = &per_cpu(init_tss, cpu); 1394 struct tss_struct *t = &per_cpu(cpu_tss, cpu);
1395 struct thread_struct *thread = &curr->thread; 1395 struct thread_struct *thread = &curr->thread;
1396 1396
1397 wait_for_master_cpu(cpu); 1397 wait_for_master_cpu(cpu);