diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2007-10-11 11:15:01 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2007-10-11 11:15:01 +0200 |
| commit | 32404da2ac967a8776083259e05afc4ea6567cea (patch) | |
| tree | 3e3bd31b3c47cc9db4a19a8834257f1e7933d83a /arch | |
| parent | 201962c9d38bc57b4764ecd03068902f8d2ad54c (diff) | |
x86_64: prepare shared kernel/trampoline.S
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86_64/kernel/Makefile | 2 | ||||
| -rw-r--r-- | arch/x86_64/kernel/trampoline_64.S (renamed from arch/x86_64/kernel/trampoline.S) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/Makefile b/arch/x86_64/kernel/Makefile index 7a71d0e7d48..2bbe7df19da 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 index e7e2764c461..e7e2764c461 100644 --- a/arch/x86_64/kernel/trampoline.S +++ b/arch/x86_64/kernel/trampoline_64.S |