Mailing List Archive

Signed-off-by: Jan Beulich <jbeulich@novell.com>

Index: 2006-10-30/xen/arch/x86/cpu/mcheck/Makefile
===================================================================
--- 2006-10-30.orig/xen/arch/x86/cpu/mcheck/Makefile 2006-11-09 14:57:55.000000000 +0100
+++ 2006-10-30/xen/arch/x86/cpu/mcheck/Makefile 2006-11-09 14:58:18.000000000 +0100
@@ -2,6 +2,6 @@ obj-y += k7.o
obj-y += mce.o
obj-y += non-fatal.o
obj-y += p4.o
-obj-y += p5.o
-obj-y += p6.o
-obj-y += winchip.o
+obj-$(x86_32) += p5.o
+obj-$(x86_32) += p6.o
+obj-$(x86_32) += winchip.o
Index: 2006-10-30/xen/arch/x86/cpu/mcheck/mce.c
===================================================================
--- 2006-10-30.orig/xen/arch/x86/cpu/mcheck/mce.c 2006-11-09 14:57:55.000000000 +0100
+++ 2006-10-30/xen/arch/x86/cpu/mcheck/mce.c 2006-11-09 13:11:33.000000000 +0100
@@ -39,18 +39,22 @@ void mcheck_init(struct cpuinfo_x86 *c)
break;

case X86_VENDOR_INTEL:
+#ifndef CONFIG_X86_64
if (c->x86==5)
intel_p5_mcheck_init(c);
if (c->x86==6)
intel_p6_mcheck_init(c);
+#endif
if (c->x86==15)
intel_p4_mcheck_init(c);
break;

+#ifndef CONFIG_X86_64
case X86_VENDOR_CENTAUR:
if (c->x86==5)
winchip_mcheck_init(c);
break;
+#endif

default:
break;


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel