diff options
| author | Jarkko Sakkinen | 2012-05-08 20:22:28 +0200 |
|---|---|---|
| committer | H. Peter Anvin | 2012-05-08 20:41:51 +0200 |
| commit | 48927bbb97c7d4cf343c05827ab9ac30c60678cb (patch) | |
| tree | 715b2efa48c5678ada3d02a73f87e1538fe8c9b2 /arch/x86/kernel/head_32.S | |
| parent | x86, realmode: Move reboot_32.S to unified realmode code (diff) | |
| download | kernel-qcow2-linux-48927bbb97c7d4cf343c05827ab9ac30c60678cb.tar.gz kernel-qcow2-linux-48927bbb97c7d4cf343c05827ab9ac30c60678cb.tar.xz kernel-qcow2-linux-48927bbb97c7d4cf343c05827ab9ac30c60678cb.zip | |
x86, realmode: Move SMP trampoline to unified realmode code
Migrated SMP trampoline code to the real mode blob.
SMP trampoline code is not yet removed from
.x86_trampoline because it is needed by the wakeup
code.
[ hpa: always enable compiling startup_32_smp in head_32.S... it is
only a few instructions which go into .init on UP builds, and it makes
the rest of the code less #ifdef ugly. ]
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@intel.com>
Link: http://lkml.kernel.org/r/1336501366-28617-6-git-send-email-jarkko.sakkinen@intel.com
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/kernel/head_32.S')
| -rw-r--r-- | arch/x86/kernel/head_32.S | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S index ce0be7cd085e..a3c2b4ffebc6 100644 --- a/arch/x86/kernel/head_32.S +++ b/arch/x86/kernel/head_32.S @@ -273,10 +273,7 @@ num_subarch_entries = (. - subarch_entries) / 4 * If cpu hotplug is not supported then this code can go in init section * which will be freed later */ - __CPUINIT - -#ifdef CONFIG_SMP ENTRY(startup_32_smp) cld movl $(__BOOT_DS),%eax @@ -287,7 +284,7 @@ ENTRY(startup_32_smp) movl pa(stack_start),%ecx movl %eax,%ss leal -__PAGE_OFFSET(%ecx),%esp -#endif /* CONFIG_SMP */ + default_entry: /* |