aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86_64/kernel
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2007-10-11 11:14:30 +0200
committerThomas Gleixner <tglx@linutronix.de>2007-10-11 11:14:30 +0200
commit7b022a67921723774a2d2fa018dfd9a5e5c3c90f (patch)
tree5931d3484447afe750549ff032190025eda690d3 /arch/x86_64/kernel
parentx86_64: prepare shared kernel/mce_intel.c (diff)
downloadlinux-dev-7b022a67921723774a2d2fa018dfd9a5e5c3c90f.tar.xz
linux-dev-7b022a67921723774a2d2fa018dfd9a5e5c3c90f.zip
x86_64: prepare shared kernel/smpboot.c
Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86_64/kernel')
-rw-r--r--arch/x86_64/kernel/Makefile2
-rw-r--r--arch/x86_64/kernel/smpboot_64.c (renamed from arch/x86_64/kernel/smpboot.c)0
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/Makefile b/arch/x86_64/kernel/Makefile
index 79e1685ecb33..fce6f3f3b4d6 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.o trampoline.o tsc_sync.o
+obj-$(CONFIG_SMP) += smp_64.o smpboot_64.o trampoline.o tsc_sync.o
obj-y += apic_64.o nmi_64.o
obj-y += io_apic_64.o mpparse.o genapic.o genapic_flat.o
obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel_64.o crash_64.o
diff --git a/arch/x86_64/kernel/smpboot.c b/arch/x86_64/kernel/smpboot_64.c
index 32f50783edc8..32f50783edc8 100644
--- a/arch/x86_64/kernel/smpboot.c
+++ b/arch/x86_64/kernel/smpboot_64.c