diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-22 12:25:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-22 12:25:47 -0700 |
| commit | d5d96ed2d89ea228bdc27980b8ee4c94422ddef5 (patch) | |
| tree | 378860da8a2b7209905fb8856746a7ce95fbca4c /arch/x86/realmode/rm/header.S | |
| parent | bd3e57f9132ac55e2848aa10cf50341de2508e1d (diff) | |
| parent | 9751d7627582fc1cc64625d63bde9528c14f1544 (diff) | |
Merge branch 'x86-reboot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86/reboot changes from Ingo Molnar:
"Now that the revampted x86 real-mode trampoline code is upstream and
seems to be working well, we can extend the 64-bit reboot code to be
as capable as the 32-bit one."
* 'x86-reboot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86-64, reboot: Be more paranoid in 64-bit reboot=bios
x86, reboot: Drop redundant write of reboot_mode
x86-64, reboot: Allow reboot=bios and reboot-cpu override on x86-64
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 fadf48378ad..a28221d94e6 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) |