---

yaml --- r: 65501 b: refs/heads/master c: 6e04c83 h: refs/heads/master i: 65499: 66502c3 v: v3
git-mirror · Oct 11, 2007 · 17c7384 · 17c7384
1 parent 24af9a4
commit 17c7384
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: e0a84f689b4373cbaa6d3a5bc5c52a613005fed1
+refs/heads/master: 6e04c835f1b9f1adde05b7439eaa1a4fff9ce8c7
diff --git a/trunk/arch/x86_64/kernel/Makefile b/trunk/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/trunk/arch/x86_64/kernel/machine_kexec.c → trunk/arch/x86_64/kernel/machine_kexec_64.c b/trunk/arch/x86_64/kernel/machine_kexec.c → trunk/arch/x86_64/kernel/machine_kexec_64.c