From 17c7384d7b75a17cb2ecb22951eeeb4be326caa4 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 11 Oct 2007 11:15:21 +0200 Subject: [PATCH] --- yaml --- r: 65501 b: refs/heads/master c: 6e04c835f1b9f1adde05b7439eaa1a4fff9ce8c7 h: refs/heads/master i: 65499: 66502c385cd8ee41475fc78806b4e0b379968293 v: v3 --- [refs] | 2 +- trunk/arch/x86_64/kernel/Makefile | 2 +- .../arch/x86_64/kernel/{machine_kexec.c => machine_kexec_64.c} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename trunk/arch/x86_64/kernel/{machine_kexec.c => machine_kexec_64.c} (100%) diff --git a/[refs] b/[refs] index bbad50829169..cd0af39688a3 100644 --- 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 index b65abc2a15a4..991a36e6873d 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_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 b/trunk/arch/x86_64/kernel/machine_kexec_64.c similarity index 100% rename from trunk/arch/x86_64/kernel/machine_kexec.c rename to trunk/arch/x86_64/kernel/machine_kexec_64.c