From 025bc84417cb592dd36c0f34296e8aee3d046c5f Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 11 Oct 2007 11:12:19 +0200 Subject: [PATCH] --- yaml --- r: 65369 b: refs/heads/master c: 77399ad90a8bd05f4b16da2ee398062d89f1719c h: refs/heads/master i: 65367: 06e36ec349274e94a73ccb88d915ad9b3ec201af v: v3 --- [refs] | 2 +- trunk/arch/i386/kernel/Makefile | 2 +- trunk/arch/i386/kernel/{nmi.c => nmi_32.c} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename trunk/arch/i386/kernel/{nmi.c => nmi_32.c} (100%) diff --git a/[refs] b/[refs] index 77b0d85f02f9..bf6d7f768bcb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 45da5aa2352153c7523dd42bb54e9378995b2194 +refs/heads/master: 77399ad90a8bd05f4b16da2ee398062d89f1719c diff --git a/trunk/arch/i386/kernel/Makefile b/trunk/arch/i386/kernel/Makefile index 2d22e13ecfd8..4967012119ae 100644 --- a/trunk/arch/i386/kernel/Makefile +++ b/trunk/arch/i386/kernel/Makefile @@ -22,7 +22,7 @@ obj-$(CONFIG_X86_SMP) += smp_32.o smpboot.o tsc_sync.o obj-$(CONFIG_SMP) += smpcommon.o obj-$(CONFIG_X86_TRAMPOLINE) += trampoline.o obj-$(CONFIG_X86_MPPARSE) += mpparse.o -obj-$(CONFIG_X86_LOCAL_APIC) += apic_32.o nmi.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.o obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel_32.o crash_32.o diff --git a/trunk/arch/i386/kernel/nmi.c b/trunk/arch/i386/kernel/nmi_32.c similarity index 100% rename from trunk/arch/i386/kernel/nmi.c rename to trunk/arch/i386/kernel/nmi_32.c