diff options
| author | Jarkko Sakkinen <jarkko.sakkinen@intel.com> | 2012-05-08 21:22:28 +0300 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2012-05-08 11:41:51 -0700 |
| commit | 48927bbb97c7d4cf343c05827ab9ac30c60678cb (patch) | |
| tree | 715b2efa48c5678ada3d02a73f87e1538fe8c9b2 /arch/x86/kernel/realmode.c | |
| parent | 5a8c9aebe04a78b069828d364798d5f24c5a42bd (diff) | |
| download | linux-next-48927bbb97c7d4cf343c05827ab9ac30c60678cb.tar.gz | |
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/realmode.c')
| -rw-r--r-- | arch/x86/kernel/realmode.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/arch/x86/kernel/realmode.c b/arch/x86/kernel/realmode.c index 7415c42547ac..a465775b32f2 100644 --- a/arch/x86/kernel/realmode.c +++ b/arch/x86/kernel/realmode.c @@ -58,6 +58,20 @@ void __init setup_real_mode(void) /* Copied header will contain relocated physical addresses. */ memcpy(&real_mode_header, real_mode_base, sizeof(struct real_mode_header)); + +#ifdef CONFIG_X86_32 + *((u32 *)__va(real_mode_header.startup_32_smp)) = __pa(startup_32_smp); + *((u32 *)__va(real_mode_header.boot_gdt)) = __pa(boot_gdt); +#else + *((u64 *) __va(real_mode_header.startup_64_smp)) = + (u64) __pa(secondary_startup_64); + + *((u64 *) __va(real_mode_header.level3_ident_pgt)) = + __pa(level3_ident_pgt) + _KERNPG_TABLE; + + *((u64 *) __va(real_mode_header.level3_kernel_pgt)) = + __pa(level3_kernel_pgt) + _KERNPG_TABLE; +#endif } /* |