From: Thomas Gleixner Date: Thu, 11 Oct 2007 09:15:01 +0000 (+0200) Subject: x86_64: prepare shared kernel/trampoline.S X-Git-Tag: v2.6.24-rc1~1567 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=32404da2ac967a8776083259e05afc4ea6567cea;p=linux-2.6 x86_64: prepare shared kernel/trampoline.S Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar --- diff --git a/arch/x86_64/kernel/Makefile b/arch/x86_64/kernel/Makefile index 7a71d0e7d4..2bbe7df19d 100644 --- a/arch/x86_64/kernel/Makefile +++ b/arch/x86_64/kernel/Makefile @@ -20,7 +20,7 @@ obj-$(CONFIG_ACPI) += acpi/ obj-$(CONFIG_X86_MSR) += msr.o obj-$(CONFIG_MICROCODE) += microcode.o obj-$(CONFIG_X86_CPUID) += cpuid.o -obj-$(CONFIG_SMP) += smp_64.o smpboot_64.o trampoline.o tsc_sync.o +obj-$(CONFIG_SMP) += smp_64.o smpboot_64.o trampoline_64.o tsc_sync.o obj-y += apic_64.o nmi_64.o obj-y += io_apic_64.o mpparse_64.o genapic_64.o genapic_flat.o obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel_64.o crash_64.o diff --git a/arch/x86_64/kernel/trampoline.S b/arch/x86_64/kernel/trampoline_64.S similarity index 100% rename from arch/x86_64/kernel/trampoline.S rename to arch/x86_64/kernel/trampoline_64.S