From 392fe400071bb0945875436456e4813ee122fe27 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 11 Oct 2007 11:14:16 +0200 Subject: [PATCH] --- yaml --- r: 65455 b: refs/heads/master c: 2e53e9012068eab25406d014618eef8993584ff1 h: refs/heads/master i: 65453: f03273d6d111f5a43a0cb70e1b544be25a48abc6 65451: b44419bfd68c316826d824c6c91a74c6b5276126 65447: 4d8386d8e49fe58a2d55b8a8809a7a088b5272a5 65439: 34329adf05fcbccb1a76d4df3a159e3c1fd53d6a v: v3 --- [refs] | 2 +- trunk/arch/x86_64/kernel/Makefile | 2 +- .../x86_64/kernel/{relocate_kernel.S => relocate_kernel_64.S} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename trunk/arch/x86_64/kernel/{relocate_kernel.S => relocate_kernel_64.S} (100%) diff --git a/[refs] b/[refs] index 86b42ecbcd3c..cfae2c5f5de2 100644 --- 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 index 0a03b62d7077..08115643c2e4 100644 --- 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 b/trunk/arch/x86_64/kernel/relocate_kernel_64.S similarity index 100% rename from trunk/arch/x86_64/kernel/relocate_kernel.S rename to trunk/arch/x86_64/kernel/relocate_kernel_64.S