---

yaml --- r: 65455 b: refs/heads/master c: 2e53e90 h: refs/heads/master i: 65453: f03273d 65451: b44419b 65447: 4d8386d 65439: 34329ad v: v3
git-mirror · Oct 11, 2007 · 392fe40 · 392fe40
1 parent 12b5681
commit 392fe40
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: 7d75d20c61641fe0915c7a7c9c414e5e2c6f3318
+refs/heads/master: 2e53e9012068eab25406d014618eef8993584ff1
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.o smpboot.o trampoline.o tsc_sync.o
 obj-y				+= apic.o  nmi.o
 obj-y				+= io_apic_64.o mpparse.o genapic.o genapic_flat.o
-obj-$(CONFIG_KEXEC)		+= machine_kexec.o relocate_kernel.o crash.o
+obj-$(CONFIG_KEXEC)		+= machine_kexec.o relocate_kernel_64.o crash.o
 obj-$(CONFIG_CRASH_DUMP)	+= crash_dump.o
 obj-$(CONFIG_PM)		+= suspend.o
 obj-$(CONFIG_HIBERNATION)	+= suspend_asm.o

diff --git a/trunk/arch/x86_64/kernel/relocate_kernel.S → ...k/arch/x86_64/kernel/relocate_kernel_64.S b/trunk/arch/x86_64/kernel/relocate_kernel.S → ...k/arch/x86_64/kernel/relocate_kernel_64.S