summaryrefslogtreecommitdiff
path: root/arch/x86/include/asm/emergency-restart.h
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2012-06-17 08:47:37 +0400
committerH. Peter Anvin <hpa@zytor.com>2012-06-17 21:51:01 +0400
commit650513979a437c32d7a0a84f0ed952a55bbb5583 (patch)
treeb831bcbfdfce6abb31573e67669272f368626b5b /arch/x86/include/asm/emergency-restart.h
parentcfaf025112d3856637ff34a767ef785ef5cf2ca9 (diff)
downloadlinux-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/include/asm/emergency-restart.h')
-rw-r--r--arch/x86/include/asm/emergency-restart.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/include/asm/emergency-restart.h b/arch/x86/include/asm/emergency-restart.h
index cc70c1c78ca4..75ce3f47d204 100644
--- a/arch/x86/include/asm/emergency-restart.h
+++ b/arch/x86/include/asm/emergency-restart.h
@@ -4,9 +4,7 @@
enum reboot_type {
BOOT_TRIPLE = 't',
BOOT_KBD = 'k',
-#ifdef CONFIG_X86_32
BOOT_BIOS = 'b',
-#endif
BOOT_ACPI = 'a',
BOOT_EFI = 'e',
BOOT_CF9 = 'p',