From 06e36ec349274e94a73ccb88d915ad9b3ec201af Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 11 Oct 2007 11:12:16 +0200 Subject: [PATCH] --- yaml --- r: 65367 b: refs/heads/master c: 0cc369a273ac6bacee9614b643de1fa283967a68 h: refs/heads/master i: 65365: 65ae945bc16c9688e409cf347a7659560cce6c3b 65363: 75900a096ccbb26b2b937ed11de8235b0520aea7 65359: 64a399cabdd01c089c75f4ddf7a5b21cea745437 v: v3 --- [refs] | 2 +- trunk/arch/i386/kernel/Makefile | 2 +- trunk/arch/i386/kernel/{apic.c => apic_32.c} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename trunk/arch/i386/kernel/{apic.c => apic_32.c} (100%) diff --git a/[refs] b/[refs] index 1a4d7803048a..6c55cfa19c0e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b9fe30ac5cdfc4337a672a498a4ba4e8d5e18728 +refs/heads/master: 0cc369a273ac6bacee9614b643de1fa283967a68 diff --git a/trunk/arch/i386/kernel/Makefile b/trunk/arch/i386/kernel/Makefile index b37e2d200430..a239a5e401a2 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.o nmi.o +obj-$(CONFIG_X86_LOCAL_APIC) += apic_32.o nmi.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/apic.c b/trunk/arch/i386/kernel/apic_32.c similarity index 100% rename from trunk/arch/i386/kernel/apic.c rename to trunk/arch/i386/kernel/apic_32.c