diff --git a/sys/arch/x86/include/cpuvar.h b/sys/arch/x86/include/cpuvar.h
index bd870c1b23f1..1b2a1ff78a4f 100644
--- a/sys/arch/x86/include/cpuvar.h
+++ b/sys/arch/x86/include/cpuvar.h
@@ -1,4 +1,4 @@
-/* 	$NetBSD: cpuvar.h,v 1.11 2007/03/20 21:22:03 xtraeme Exp $ */
+/* 	$NetBSD: cpuvar.h,v 1.12 2007/03/21 00:16:52 xtraeme Exp $ */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -94,7 +94,9 @@ struct cpu_attach_args {
 #ifdef _KERNEL
 
 #include "opt_multiprocessor.h"
+#ifndef XEN
 #include "opt_intel_odcm.h"
+#endif
 
 #ifdef MULTIPROCESSOR
 extern u_int32_t cpus_running;
diff --git a/sys/arch/x86/x86/x86_machdep.c b/sys/arch/x86/x86/x86_machdep.c
index c31cc24ee009..ea86d8bdc79c 100644
--- a/sys/arch/x86/x86/x86_machdep.c
+++ b/sys/arch/x86/x86/x86_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: x86_machdep.c,v 1.9 2007/03/20 21:07:39 xtraeme Exp $	*/
+/*	$NetBSD: x86_machdep.c,v 1.10 2007/03/21 00:16:52 xtraeme Exp $	*/
 
 /*-
  * Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: x86_machdep.c,v 1.9 2007/03/20 21:07:39 xtraeme Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_machdep.c,v 1.10 2007/03/21 00:16:52 xtraeme Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -134,5 +134,7 @@ x86_pause(void)
 void
 x86_init(void)
 {
+#ifndef XEN
 	msr_cpu_broadcast_initmtx();
+#endif
 }