From b0bc87adfedab985a6c3e8113a2bb2a73acd18d6 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 11 Oct 2007 11:13:12 +0200 Subject: [PATCH] --- yaml --- r: 65406 b: refs/heads/master c: fcaf15d788dc0c8354dbcf449e260cb303120b75 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/i386/kernel/Makefile | 2 +- trunk/arch/i386/kernel/{machine_kexec.c => machine_kexec_32.c} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename trunk/arch/i386/kernel/{machine_kexec.c => machine_kexec_32.c} (100%) diff --git a/[refs] b/[refs] index 298da443a2ec..d7c838d429bb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: deb8677148fef3aea11edd4e980f6eb9c564f3cd +refs/heads/master: fcaf15d788dc0c8354dbcf449e260cb303120b75 diff --git a/trunk/arch/i386/kernel/Makefile b/trunk/arch/i386/kernel/Makefile index 6ecf97da63b0..8d80220932f8 100644 --- a/trunk/arch/i386/kernel/Makefile +++ b/trunk/arch/i386/kernel/Makefile @@ -25,7 +25,7 @@ obj-$(CONFIG_X86_MPPARSE) += mpparse_32.o obj-$(CONFIG_X86_LOCAL_APIC) += apic_32.o nmi_32.o obj-$(CONFIG_X86_IO_APIC) += io_apic_32.o obj-$(CONFIG_X86_REBOOTFIXUPS) += reboot_fixups_32.o -obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel_32.o crash_32.o +obj-$(CONFIG_KEXEC) += machine_kexec_32.o relocate_kernel_32.o crash_32.o obj-$(CONFIG_CRASH_DUMP) += crash_dump_32.o obj-$(CONFIG_X86_NUMAQ) += numaq_32.o obj-$(CONFIG_X86_SUMMIT_NUMA) += summit_32.o diff --git a/trunk/arch/i386/kernel/machine_kexec.c b/trunk/arch/i386/kernel/machine_kexec_32.c similarity index 100% rename from trunk/arch/i386/kernel/machine_kexec.c rename to trunk/arch/i386/kernel/machine_kexec_32.c