summaryrefslogtreecommitdiff
path: root/arch/x86/include/asm/realmode.h
diff options
context:
space:
mode:
authorJarkko Sakkinen <jarkko.sakkinen@intel.com>2012-05-08 22:22:27 +0400
committerH. Peter Anvin <hpa@linux.intel.com>2012-05-08 22:41:50 +0400
commit5a8c9aebe04a78b069828d364798d5f24c5a42bd (patch)
tree0c56b496e810fea8b97c31c9a72f49855983234e /arch/x86/include/asm/realmode.h
parent084ee1c641a068bfd1194d545f7dc9ab2043eb35 (diff)
downloadlinux-5a8c9aebe04a78b069828d364798d5f24c5a42bd.tar.xz
x86, realmode: Move reboot_32.S to unified realmode code
Migrated reboot_32.S from x86_trampoline to the real-mode blob. Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@intel.com> Link: http://lkml.kernel.org/r/1336501366-28617-5-git-send-email-jarkko.sakkinen@intel.com Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/include/asm/realmode.h')
-rw-r--r--arch/x86/include/asm/realmode.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/include/asm/realmode.h b/arch/x86/include/asm/realmode.h
index dc1bba534c14..bf26b0681931 100644
--- a/arch/x86/include/asm/realmode.h
+++ b/arch/x86/include/asm/realmode.h
@@ -9,6 +9,10 @@ struct real_mode_header {
u32 text_start;
u32 ro_end;
u32 end;
+ /* reboot */
+#ifdef CONFIG_X86_32
+ u32 machine_real_restart_asm;
+#endif
} __attribute__((__packed__));
extern struct real_mode_header real_mode_header;