1.1 --- a/xen/arch/x86/cpu/mcheck/Makefile	Mon Nov 13 14:11:08 2006 +0000
     1.2 +++ b/xen/arch/x86/cpu/mcheck/Makefile	Mon Nov 13 14:12:01 2006 +0000
     1.3 @@ -2,6 +2,6 @@ obj-y += k7.o
     1.4  obj-y += mce.o
     1.5  obj-y += non-fatal.o
     1.6  obj-y += p4.o
     1.7 -obj-y += p5.o
     1.8 -obj-y += p6.o
     1.9 -obj-y += winchip.o
    1.10 +obj-$(x86_32) += p5.o
    1.11 +obj-$(x86_32) += p6.o
    1.12 +obj-$(x86_32) += winchip.o

     2.1 --- a/xen/arch/x86/cpu/mcheck/mce.c	Mon Nov 13 14:11:08 2006 +0000
     2.2 +++ b/xen/arch/x86/cpu/mcheck/mce.c	Mon Nov 13 14:12:01 2006 +0000
     2.3 @@ -39,18 +39,22 @@ void mcheck_init(struct cpuinfo_x86 *c)
     2.4  			break;
     2.5  
     2.6  		case X86_VENDOR_INTEL:
     2.7 +#ifndef CONFIG_X86_64
     2.8  			if (c->x86==5)
     2.9  				intel_p5_mcheck_init(c);
    2.10  			if (c->x86==6)
    2.11  				intel_p6_mcheck_init(c);
    2.12 +#endif
    2.13  			if (c->x86==15)
    2.14  				intel_p4_mcheck_init(c);
    2.15  			break;
    2.16  
    2.17 +#ifndef CONFIG_X86_64
    2.18  		case X86_VENDOR_CENTAUR:
    2.19  			if (c->x86==5)
    2.20  				winchip_mcheck_init(c);
    2.21  			break;
    2.22 +#endif
    2.23  
    2.24  		default:
    2.25  			break;