From ff2f9ed2fccf551f9ed968c8038bc4ac086f8342 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 11 Oct 2007 11:15:01 +0200 Subject: [PATCH] --- yaml --- r: 65488 b: refs/heads/master c: 32404da2ac967a8776083259e05afc4ea6567cea h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86_64/kernel/Makefile | 2 +- trunk/arch/x86_64/kernel/{trampoline.S => trampoline_64.S} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename trunk/arch/x86_64/kernel/{trampoline.S => trampoline_64.S} (100%) diff --git a/[refs] b/[refs] index 64a70bcd3132..2d51fc372dec 100644 --- 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 index 7a71d0e7d48a..2bbe7df19daa 100644 --- 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 b/trunk/arch/x86_64/kernel/trampoline_64.S similarity index 100% rename from trunk/arch/x86_64/kernel/trampoline.S rename to trunk/arch/x86_64/kernel/trampoline_64.S