summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorThomas Gleixner2007-10-11 11:15:21 +0200
committerThomas Gleixner2007-10-11 11:15:21 +0200
commit6e04c835f1b9f1adde05b7439eaa1a4fff9ce8c7 (patch)
tree5812d8c28709f36af2b40364b3b4d70fc8ed2402 /arch
parentx86_64: prepare shared kernel/verify_cpu.S (diff)
downloadkernel-qcow2-linux-6e04c835f1b9f1adde05b7439eaa1a4fff9ce8c7.tar.gz
kernel-qcow2-linux-6e04c835f1b9f1adde05b7439eaa1a4fff9ce8c7.tar.xz
kernel-qcow2-linux-6e04c835f1b9f1adde05b7439eaa1a4fff9ce8c7.zip
x86_64: prepare shared kernel/machine_kexec.c
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/Makefile2
-rw-r--r--arch/x86_64/kernel/machine_kexec_64.c (renamed from arch/x86_64/kernel/machine_kexec.c)0
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/Makefile b/arch/x86_64/kernel/Makefile
index b65abc2a15a4..991a36e6873d 100644
--- a/arch/x86_64/kernel/Makefile
+++ b/arch/x86_64/kernel/Makefile
@@ -23,7 +23,7 @@ obj-$(CONFIG_X86_CPUID) += cpuid.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_64.o
-obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel_64.o crash_64.o
+obj-$(CONFIG_KEXEC) += machine_kexec_64.o relocate_kernel_64.o crash_64.o
obj-$(CONFIG_CRASH_DUMP) += crash_dump_64.o
obj-$(CONFIG_PM) += suspend_64.o
obj-$(CONFIG_HIBERNATION) += suspend_asm_64.o
diff --git a/arch/x86_64/kernel/machine_kexec.c b/arch/x86_64/kernel/machine_kexec_64.c
index c3a554703672..c3a554703672 100644
--- a/arch/x86_64/kernel/machine_kexec.c
+++ b/arch/x86_64/kernel/machine_kexec_64.c