From e502237ed9d6c41d99e5d02564d4288d06396e8c Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 11 Oct 2007 11:12:24 +0200 Subject: [PATCH] --- yaml --- r: 65373 b: refs/heads/master c: 0273be2dcee34d3b955348cebef92cd796f06717 h: refs/heads/master i: 65371: 19624ddd41199ca9705037214ce38ede47f23a3f v: v3 --- [refs] | 2 +- trunk/arch/i386/kernel/Makefile | 2 +- trunk/arch/i386/kernel/{smpboot.c => smpboot_32.c} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename trunk/arch/i386/kernel/{smpboot.c => smpboot_32.c} (100%) diff --git a/[refs] b/[refs] index d917df2b23e3..81f1562a4768 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5d43542f0c223e3643d88adb05ed466e6f0c8337 +refs/heads/master: 0273be2dcee34d3b955348cebef92cd796f06717 diff --git a/trunk/arch/i386/kernel/Makefile b/trunk/arch/i386/kernel/Makefile index 670bfdf57b6c..3b7a82d23950 100644 --- a/trunk/arch/i386/kernel/Makefile +++ b/trunk/arch/i386/kernel/Makefile @@ -18,7 +18,7 @@ obj-$(CONFIG_X86_MSR) += msr.o obj-$(CONFIG_X86_CPUID) += cpuid.o obj-$(CONFIG_MICROCODE) += microcode.o obj-$(CONFIG_APM) += apm.o -obj-$(CONFIG_X86_SMP) += smp_32.o smpboot.o tsc_sync.o +obj-$(CONFIG_X86_SMP) += smp_32.o smpboot_32.o tsc_sync.o obj-$(CONFIG_SMP) += smpcommon.o obj-$(CONFIG_X86_TRAMPOLINE) += trampoline.o obj-$(CONFIG_X86_MPPARSE) += mpparse.o diff --git a/trunk/arch/i386/kernel/smpboot.c b/trunk/arch/i386/kernel/smpboot_32.c similarity index 100% rename from trunk/arch/i386/kernel/smpboot.c rename to trunk/arch/i386/kernel/smpboot_32.c