| commit | 5a8c9aebe04a78b069828d364798d5f24c5a42bd | [log] [tgz] |
|---|---|---|
| author | Jarkko Sakkinen <jarkko.sakkinen@intel.com> | Tue May 08 21:22:27 2012 +0300 |
| committer | H. Peter Anvin <hpa@linux.intel.com> | Tue May 08 11:41:50 2012 -0700 |
| tree | 0c56b496e810fea8b97c31c9a72f49855983234e | |
| parent | 084ee1c641a068bfd1194d545f7dc9ab2043eb35 [diff] |
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>
diff --git a/arch/x86/include/asm/realmode.h b/arch/x86/include/asm/realmode.h index dc1bba5..bf26b06 100644 --- a/arch/x86/include/asm/realmode.h +++ b/arch/x86/include/asm/realmode.h
@@ -9,6 +9,10 @@ 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;