diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2012-06-16 21:47:37 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2012-06-17 10:51:01 -0700 |
| commit | 650513979a437c32d7a0a84f0ed952a55bbb5583 (patch) | |
| tree | b831bcbfdfce6abb31573e67669272f368626b5b /arch/x86/realmode/rm/Makefile | |
| parent | cfaf025112d3856637ff34a767ef785ef5cf2ca9 (diff) | |
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/Makefile')
| -rw-r--r-- | arch/x86/realmode/rm/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/realmode/rm/Makefile b/arch/x86/realmode/rm/Makefile index 5b84a2d3088..b2d534cab25 100644 --- a/arch/x86/realmode/rm/Makefile +++ b/arch/x86/realmode/rm/Makefile @@ -22,7 +22,7 @@ wakeup-objs += video-bios.o realmode-y += header.o realmode-y += trampoline_$(BITS).o realmode-y += stack.o -realmode-$(CONFIG_X86_32) += reboot_32.o +realmode-y += reboot.o realmode-$(CONFIG_ACPI_SLEEP) += $(wakeup-objs) targets += $(realmode-y) |