aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/smpboot_32.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/kernel/smpboot_32.c')
-rw-r--r--arch/x86/kernel/smpboot_32.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/x86/kernel/smpboot_32.c b/arch/x86/kernel/smpboot_32.c
index 0bf7f20baba0..3566191832b3 100644
--- a/arch/x86/kernel/smpboot_32.c
+++ b/arch/x86/kernel/smpboot_32.c
@@ -447,7 +447,7 @@ void __devinit initialize_secondary(void)
447{ 447{
448 /* 448 /*
449 * We don't actually need to load the full TSS, 449 * We don't actually need to load the full TSS,
450 * basically just the stack pointer and the eip. 450 * basically just the stack pointer and the ip.
451 */ 451 */
452 452
453 asm volatile( 453 asm volatile(
@@ -459,7 +459,7 @@ void __devinit initialize_secondary(void)
459 459
460/* Static state in head.S used to set up a CPU */ 460/* Static state in head.S used to set up a CPU */
461extern struct { 461extern struct {
462 void * esp; 462 void * sp;
463 unsigned short ss; 463 unsigned short ss;
464} stack_start; 464} stack_start;
465 465
@@ -667,7 +667,7 @@ wakeup_secondary_cpu(int phys_apicid, unsigned long start_eip)
667 * target processor state. 667 * target processor state.
668 */ 668 */
669 startup_ipi_hook(phys_apicid, (unsigned long) start_secondary, 669 startup_ipi_hook(phys_apicid, (unsigned long) start_secondary,
670 (unsigned long) stack_start.esp); 670 (unsigned long) stack_start.sp);
671 671
672 /* 672 /*
673 * Run STARTUP IPI loop. 673 * Run STARTUP IPI loop.
@@ -806,9 +806,9 @@ static int __cpuinit do_boot_cpu(int apicid, int cpu)
806 alternatives_smp_switch(1); 806 alternatives_smp_switch(1);
807 807
808 /* So we see what's up */ 808 /* So we see what's up */
809 printk("Booting processor %d/%d eip %lx\n", cpu, apicid, start_eip); 809 printk("Booting processor %d/%d ip %lx\n", cpu, apicid, start_eip);
810 /* Stack for startup_32 can be just as for start_secondary onwards */ 810 /* Stack for startup_32 can be just as for start_secondary onwards */
811 stack_start.esp = (void *) idle->thread.esp; 811 stack_start.sp = (void *) idle->thread.esp;
812 812
813 irq_ctx_init(cpu); 813 irq_ctx_init(cpu);
814 814