]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
x86_64: prepare shared kernel/trampoline.S
authorThomas Gleixner <tglx@linutronix.de>
Thu, 11 Oct 2007 09:15:01 +0000 (11:15 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Thu, 11 Oct 2007 09:15:01 +0000 (11:15 +0200)
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86_64/kernel/Makefile
arch/x86_64/kernel/trampoline_64.S [moved from arch/x86_64/kernel/trampoline.S with 100% similarity]

index 7a71d0e7d48aad1a4a108c14e4f248b72bd5ffdb..2bbe7df19daa7d220b2a91a531dd4b7f8a0e508a 100644 (file)
@@ -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