---

yaml --- r: 65488 b: refs/heads/master c: 32404da h: refs/heads/master v: v3
git-mirror · Oct 11, 2007 · ff2f9ed · ff2f9ed
1 parent f48be42
commit ff2f9ed
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 201962c9d38bc57b4764ecd03068902f8d2ad54c
+refs/heads/master: 32404da2ac967a8776083259e05afc4ea6567cea
diff --git a/trunk/arch/x86_64/kernel/Makefile b/trunk/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/trunk/arch/x86_64/kernel/trampoline.S → trunk/arch/x86_64/kernel/trampoline_64.S b/trunk/arch/x86_64/kernel/trampoline.S → trunk/arch/x86_64/kernel/trampoline_64.S