Skip to contentSkip to conversation

x86-64: don't compile some unused machine check code

PATCH New Jan Beulich 1 participant 1 message Nov 13, 2006

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86-64: don't compile some unused machine check code

xen/arch/x86/cpu/mcheck/Makefile +3 -3
Index: 2006-10-30/xen/arch/x86/cpu/mcheck/Makefile
===================================================================
@@ -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
xen/arch/x86/cpu/mcheck/mce.c +4 -0
Index: 2006-10-30/xen/arch/x86/cpu/mcheck/mce.c
===================================================================
@@ -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;