x86, realmode: Move SMP trampoline to unified realmode code

[cascardo/linux.git] / arch / x86 / realmode / rm / header.S

diff --git a/arch/x86/realmode/rm/header.S b/arch/x86/realmode/rm/header.S
index db21401..a979004 100644 (file)
--- a/arch/x86/realmode/rm/header.S
+++ b/arch/x86/realmode/rm/header.S
@@ -15,5 +15,16 @@ ENTRY(real_mode_header)
                .long   pa_end
 #ifdef CONFIG_X86_32
                .long   pa_machine_real_restart_asm
+#endif
+               /* SMP trampoline */
+               .long   pa_trampoline_data
+               .long   pa_trampoline_status
+#ifdef CONFIG_X86_32
+               .long   pa_startup_32_smp
+               .long   pa_boot_gdt
+#else
+               .long   pa_startup_64_smp
+               .long   pa_level3_ident_pgt
+               .long   pa_level3_kernel_pgt
 #endif
 END(real_mode_header)