diff options
author | Ingo Molnar <mingo@elte.hu> | 2011-02-14 13:18:51 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-02-14 13:18:56 +0100 |
commit | 91e04ec05838a5b2c790decf2a91af98cb1666e8 (patch) | |
tree | ea7373bdfab118ab6312ed3fa1fc0694ccfb38db /arch/x86/kernel/smpboot.c | |
parent | 792363d2beceb1c7d865e517fa9939c8b8c1442a (diff) | |
parent | 100b33c8bd8a3235fd0b7948338d6cbb3db3c63d (diff) | |
download | kernel_samsung_smdk4412-91e04ec05838a5b2c790decf2a91af98cb1666e8.zip kernel_samsung_smdk4412-91e04ec05838a5b2c790decf2a91af98cb1666e8.tar.gz kernel_samsung_smdk4412-91e04ec05838a5b2c790decf2a91af98cb1666e8.tar.bz2 |
Merge commit 'v2.6.38-rc4' into x86/cpu
Merge reason: pick up the latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 a7a3d1a..592214d 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -620,7 +620,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. @@ -767,7 +767,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(); |