x86, realmode: Move SMP trampoline to unified realmode code

[cascardo/linux.git] / arch / x86 / include / asm / realmode.h

diff --git a/arch/x86/include/asm/realmode.h b/arch/x86/include/asm/realmode.h
index bf26b06..9b4a5da 100644 (file)
--- a/arch/x86/include/asm/realmode.h
+++ b/arch/x86/include/asm/realmode.h
@@ -12,6 +12,17 @@ struct real_mode_header {
        /* reboot */
 #ifdef CONFIG_X86_32
        u32     machine_real_restart_asm;
+#endif
+       /* SMP trampoline */
+       u32     trampoline_data;
+       u32     trampoline_status;
+#ifdef CONFIG_X86_32
+       u32     startup_32_smp;
+       u32     boot_gdt;
+#else
+       u32     startup_64_smp;
+       u32     level3_ident_pgt;
+       u32     level3_kernel_pgt;
 #endif
 } __attribute__((__packed__));
 
@@ -25,6 +36,13 @@ extern unsigned long initial_gs;
 extern unsigned char real_mode_blob[];
 extern unsigned char real_mode_relocs[];
 
+#ifdef CONFIG_X86_32
+extern unsigned char startup_32_smp[];
+extern unsigned char boot_gdt[];
+#else
+extern unsigned char secondary_startup_64[];
+#endif
+
 extern void __init setup_real_mode(void);
 
 #endif /* _ARCH_X86_REALMODE_H */