diff options
Diffstat (limited to 'arch/x86/kernel/cpu/common.c')
-rw-r--r-- | arch/x86/kernel/cpu/common.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index 0ee9a3254ee..4868e4a951e 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c | |||
@@ -1095,7 +1095,7 @@ static void clear_all_debug_regs(void) | |||
1095 | 1095 | ||
1096 | void __cpuinit cpu_init(void) | 1096 | void __cpuinit cpu_init(void) |
1097 | { | 1097 | { |
1098 | struct orig_ist *orig_ist; | 1098 | struct orig_ist *oist; |
1099 | struct task_struct *me; | 1099 | struct task_struct *me; |
1100 | struct tss_struct *t; | 1100 | struct tss_struct *t; |
1101 | unsigned long v; | 1101 | unsigned long v; |
@@ -1104,7 +1104,7 @@ void __cpuinit cpu_init(void) | |||
1104 | 1104 | ||
1105 | cpu = stack_smp_processor_id(); | 1105 | cpu = stack_smp_processor_id(); |
1106 | t = &per_cpu(init_tss, cpu); | 1106 | t = &per_cpu(init_tss, cpu); |
1107 | orig_ist = &per_cpu(orig_ist, cpu); | 1107 | oist = &per_cpu(orig_ist, cpu); |
1108 | 1108 | ||
1109 | #ifdef CONFIG_NUMA | 1109 | #ifdef CONFIG_NUMA |
1110 | if (cpu != 0 && percpu_read(node_number) == 0 && | 1110 | if (cpu != 0 && percpu_read(node_number) == 0 && |
@@ -1145,12 +1145,12 @@ void __cpuinit cpu_init(void) | |||
1145 | /* | 1145 | /* |
1146 | * set up and load the per-CPU TSS | 1146 | * set up and load the per-CPU TSS |
1147 | */ | 1147 | */ |
1148 | if (!orig_ist->ist[0]) { | 1148 | if (!oist->ist[0]) { |
1149 | char *estacks = per_cpu(exception_stacks, cpu); | 1149 | char *estacks = per_cpu(exception_stacks, cpu); |
1150 | 1150 | ||
1151 | for (v = 0; v < N_EXCEPTION_STACKS; v++) { | 1151 | for (v = 0; v < N_EXCEPTION_STACKS; v++) { |
1152 | estacks += exception_stack_sizes[v]; | 1152 | estacks += exception_stack_sizes[v]; |
1153 | orig_ist->ist[v] = t->x86_tss.ist[v] = | 1153 | oist->ist[v] = t->x86_tss.ist[v] = |
1154 | (unsigned long)estacks; | 1154 | (unsigned long)estacks; |
1155 | } | 1155 | } |
1156 | } | 1156 | } |