]> err.no Git - linux-2.6/commitdiff
x86_64: prepare shared kernel/relocate_kernel.S
authorThomas Gleixner <tglx@linutronix.de>
Thu, 11 Oct 2007 09:14:16 +0000 (11:14 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Thu, 11 Oct 2007 09:14:16 +0000 (11:14 +0200)
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86_64/kernel/Makefile
arch/x86_64/kernel/relocate_kernel_64.S [moved from arch/x86_64/kernel/relocate_kernel.S with 100% similarity]

index 0a03b62d707762ca45afccdda1c057276c9949c8..08115643c2e49a21462105323e5b4982cbe5c03e 100644 (file)
@@ -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