---

yaml --- r: 65369 b: refs/heads/master c: 77399ad h: refs/heads/master i: 65367: 06e36ec v: v3
git-mirror · Oct 11, 2007 · 025bc84 · 025bc84
1 parent dbd47e8
commit 025bc84
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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 → trunk/arch/i386/kernel/nmi_32.c b/trunk/arch/i386/kernel/nmi.c → trunk/arch/i386/kernel/nmi_32.c