diff options
author | H. Peter Anvin <hpa@linux.intel.com> | 2011-02-14 21:36:03 -0500 |
---|---|---|
committer | H. Peter Anvin <hpa@linux.intel.com> | 2011-02-18 00:05:34 -0500 |
commit | 3d35ac346e981162eeba391e496faceed4753e7b (patch) | |
tree | 1f902bd0b8d62aa65b9d216483cbecc9a712a72b /arch/x86/kernel/Makefile | |
parent | 014eea518af3d141e276664cf40ef3da899eba35 (diff) |
x86, reboot: Move the real-mode reboot code to an assembly file
Move the real-mode reboot code out to an assembly file (reboot_32.S)
which is allocated using the common lowmem trampoline allocator.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
LKML-Reference: <4D5DFBE4.7090104@intel.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Rafael J. Wysocki <rjw@sisk.pl>
Cc: Matthieu Castet <castet.matthieu@free.fr>
Diffstat (limited to 'arch/x86/kernel/Makefile')
-rw-r--r-- | arch/x86/kernel/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index 2e8ce0deae4a..778c5b93676d 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile | |||
@@ -59,6 +59,7 @@ obj-$(CONFIG_STACKTRACE) += stacktrace.o | |||
59 | obj-y += cpu/ | 59 | obj-y += cpu/ |
60 | obj-y += acpi/ | 60 | obj-y += acpi/ |
61 | obj-y += reboot.o | 61 | obj-y += reboot.o |
62 | obj-$(CONFIG_X86_32) += reboot_32.o | ||
62 | obj-$(CONFIG_MCA) += mca_32.o | 63 | obj-$(CONFIG_MCA) += mca_32.o |
63 | obj-$(CONFIG_X86_MSR) += msr.o | 64 | obj-$(CONFIG_X86_MSR) += msr.o |
64 | obj-$(CONFIG_X86_CPUID) += cpuid.o | 65 | obj-$(CONFIG_X86_CPUID) += cpuid.o |