---

yaml --- r: 148872 b: refs/heads/master c: dba3725 h: refs/heads/master v: v3
git-mirror · May 28, 2009 · 1504ef0 · 1504ef0
1 parent 270ee96
commit 1504ef0
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 79 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 711c2e481c9d1113650d09de10f61ee88ab56fda
+refs/heads/master: dba3725d44f5dfb5711fd509fca10b5b828c43b7
diff --git a/trunk/arch/x86/kernel/cpu/mcheck/Makefile b/trunk/arch/x86/kernel/cpu/mcheck/Makefile
@@ -1,4 +1,4 @@
-obj-y				=  mce_$(BITS).o therm_throt.o
+obj-y				=  mce.o therm_throt.o
 
 obj-$(CONFIG_X86_32)		+= k7.o p4.o p5.o p6.o winchip.o
 obj-$(CONFIG_X86_MCE_P4THERMAL)	+= mce_intel.o

diff --git a/trunk/arch/x86/kernel/cpu/mcheck/mce_64.c → trunk/arch/x86/kernel/cpu/mcheck/mce.c b/trunk/arch/x86/kernel/cpu/mcheck/mce_64.c → trunk/arch/x86/kernel/cpu/mcheck/mce.c
diff --git a/trunk/arch/x86/kernel/cpu/mcheck/mce_32.c b/trunk/arch/x86/kernel/cpu/mcheck/mce_32.c