x86, realmode: header for trampoline 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..1421eed 100644 (file)
--- a/arch/x86/include/asm/realmode.h
+++ b/arch/x86/include/asm/realmode.h
@@ -8,15 +8,37 @@
 struct real_mode_header {
        u32     text_start;
        u32     ro_end;
-       u32     end;
-       /* reboot */
+       /* SMP trampoline */
+       u32     trampoline_start;
+       u32     trampoline_status;
+       u32     trampoline_header;
+#ifdef CONFIG_X86_64
+       u32     trampoline_pgd;
+#endif
+       /* ACPI S3 wakeup */
+#ifdef CONFIG_ACPI_SLEEP
+       u32     wakeup_start;
+       u32     wakeup_header;
+#endif
+       /* APM/BIOS reboot */
 #ifdef CONFIG_X86_32
        u32     machine_real_restart_asm;
 #endif
 } __attribute__((__packed__));
 
-extern struct real_mode_header real_mode_header;
-extern unsigned char *real_mode_base;
+/* This must match data at trampoline_32/64.S */
+struct trampoline_header {
+#ifdef CONFIG_X86_32
+       u32 start;
+       u16 gdt_limit;
+       u32 gdt_base;
+#else
+       u64 start;
+#endif
+} __attribute__((__packed__));
+
+extern struct real_mode_header *real_mode_header;
+extern unsigned char real_mode_blob_end[];
 
 extern unsigned long init_rsp;
 extern unsigned long initial_code;
@@ -25,6 +47,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 */