diff options
| author | Jarkko Sakkinen <jarkko.sakkinen@intel.com> | 2012-05-08 22:22:27 +0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2012-05-08 22:41:50 +0400 |
| commit | 5a8c9aebe04a78b069828d364798d5f24c5a42bd (patch) | |
| tree | 0c56b496e810fea8b97c31c9a72f49855983234e /arch/x86/realmode/rm/header.S | |
| parent | 084ee1c641a068bfd1194d545f7dc9ab2043eb35 (diff) | |
| download | linux-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/realmode/rm/header.S')
| -rw-r--r-- | arch/x86/realmode/rm/header.S | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/realmode/rm/header.S b/arch/x86/realmode/rm/header.S index 7be17f2c65a3..db21401c0c57 100644 --- a/arch/x86/realmode/rm/header.S +++ b/arch/x86/realmode/rm/header.S @@ -13,4 +13,7 @@ ENTRY(real_mode_header) .long pa_text_start .long pa_ro_end .long pa_end +#ifdef CONFIG_X86_32 + .long pa_machine_real_restart_asm +#endif END(real_mode_header) |