diff options
author | H. Peter Anvin <hpa@linux.intel.com> | 2011-02-04 16:14:11 -0800 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2011-02-04 22:27:28 -0800 |
commit | 11d4c3f9b671720e80353dd7e433ff2bf65e9500 (patch) | |
tree | b3560b0642216e9c9e1a54e57a5f55845f063e6b /arch/x86/kernel/smpboot.c | |
parent | f7448548a9f32db38f243ccd4271617758ddfe2c (diff) | |
download | kernel_samsung_smdk4412-11d4c3f9b671720e80353dd7e433ff2bf65e9500.zip kernel_samsung_smdk4412-11d4c3f9b671720e80353dd7e433ff2bf65e9500.tar.gz kernel_samsung_smdk4412-11d4c3f9b671720e80353dd7e433ff2bf65e9500.tar.bz2 |
x86-32: Make sure the stack is set up before we use it
Since checkin ebba638ae723d8a8fc2f7abce5ec18b688b791d7 we call
verify_cpu even in 32-bit mode. Unfortunately, calling a function
means using the stack, and the stack pointer was not initialized in
the 32-bit setup code! This code initializes the stack pointer, and
simplifies the interface slightly since it is easier to rely on just a
pointer value rather than a descriptor; we need to have different
values for the segment register anyway.
This retains start_stack as a virtual address, even though a physical
address would be more convenient for 32 bits; the 64-bit code wants
the other way around...
Reported-by: Matthieu Castet <castet.matthieu@free.fr>
LKML-Reference: <4D41E86D.8060205@free.fr>
Tested-by: Kees Cook <kees.cook@canonical.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/kernel/smpboot.c')
-rw-r--r-- | arch/x86/kernel/smpboot.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index 0cbe8c0..03273b6 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -638,7 +638,7 @@ wakeup_secondary_cpu_via_init(int phys_apicid, unsigned long start_eip) * target processor state. */ startup_ipi_hook(phys_apicid, (unsigned long) start_secondary, - (unsigned long)stack_start.sp); + stack_start); /* * Run STARTUP IPI loop. @@ -785,7 +785,7 @@ do_rest: #endif early_gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu); initial_code = (unsigned long)start_secondary; - stack_start.sp = (void *) c_idle.idle->thread.sp; + stack_start = c_idle.idle->thread.sp; /* start_ip had better be page-aligned! */ start_ip = setup_trampoline(); |