diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2012-06-17 08:47:37 +0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2012-06-17 21:51:01 +0400 |
| commit | 650513979a437c32d7a0a84f0ed952a55bbb5583 (patch) | |
| tree | b831bcbfdfce6abb31573e67669272f368626b5b /arch/x86/realmode/rm/header.S | |
| parent | cfaf025112d3856637ff34a767ef785ef5cf2ca9 (diff) | |
| download | linux-650513979a437c32d7a0a84f0ed952a55bbb5583.tar.xz | |
x86-64, reboot: Allow reboot=bios and reboot-cpu override on x86-64
With the revamped realmode trampoline code, it is trivial to extend
support for reboot=bios to x86-64. Furthermore, while we are at it,
remove the restriction that only we can only override the reboot CPU
on 32 bits.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Link: http://lkml.kernel.org/n/tip-jopx7y6g6dbcx4tpal8q0jlr@git.kernel.org
Diffstat (limited to 'arch/x86/realmode/rm/header.S')
| -rw-r--r-- | arch/x86/realmode/rm/header.S | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/realmode/rm/header.S b/arch/x86/realmode/rm/header.S index fadf48378ada..a28221d94e69 100644 --- a/arch/x86/realmode/rm/header.S +++ b/arch/x86/realmode/rm/header.S @@ -6,6 +6,7 @@ #include <linux/linkage.h> #include <asm/page_types.h> +#include <asm/segment.h> #include "realmode.h" @@ -28,8 +29,9 @@ GLOBAL(real_mode_header) .long pa_wakeup_header #endif /* APM/BIOS reboot */ -#ifdef CONFIG_X86_32 .long pa_machine_real_restart_asm +#ifdef CONFIG_X86_64 + .long __KERNEL32_CS #endif END(real_mode_header) |