From 5337c50581c88ee7451f5b2e7b986f8a0c43bb03 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Tue, 23 Oct 2007 22:37:23 +0200 Subject: [PATCH] --- yaml --- r: 72366 b: refs/heads/master c: 3bc258ad87e5b0bbbca247b24ce8fac380c7d86b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/cpu/mcheck/Makefile | 6 ++---- trunk/arch/x86/kernel/cpu/mcheck/{mce.c => mce_32.c} | 0 3 files changed, 3 insertions(+), 5 deletions(-) rename trunk/arch/x86/kernel/cpu/mcheck/{mce.c => mce_32.c} (100%) diff --git a/[refs] b/[refs] index 923d06aa9195..01aacc43d315 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 34d19e29c9402b6149c128517f73e7773d5838bf +refs/heads/master: 3bc258ad87e5b0bbbca247b24ce8fac380c7d86b diff --git a/trunk/arch/x86/kernel/cpu/mcheck/Makefile b/trunk/arch/x86/kernel/cpu/mcheck/Makefile index 1ba7e3f52769..403e720497ee 100644 --- a/trunk/arch/x86/kernel/cpu/mcheck/Makefile +++ b/trunk/arch/x86/kernel/cpu/mcheck/Makefile @@ -1,5 +1,3 @@ -obj-$(CONFIG_X86_32) = mce.o k7.o p4.o p5.o p6.o winchip.o +obj-y = mce_$(BITS).o therm_throt.o +obj-$(CONFIG_X86_32) += k7.o p4.o p5.o p6.o winchip.o obj-$(CONFIG_X86_MCE_NONFATAL) += non-fatal.o - -# shared between i386 and x86_64 -obj-y += therm_throt.o diff --git a/trunk/arch/x86/kernel/cpu/mcheck/mce.c b/trunk/arch/x86/kernel/cpu/mcheck/mce_32.c similarity index 100% rename from trunk/arch/x86/kernel/cpu/mcheck/mce.c rename to trunk/arch/x86/kernel/cpu/mcheck/mce_32.c