diff --git a/sys/arch/x86/x86/msr_ipifuncs.c b/sys/arch/x86/x86/msr_ipifuncs.c
index c2fff4ef8aa8..f029009cde3f 100644
--- a/sys/arch/x86/x86/msr_ipifuncs.c
+++ b/sys/arch/x86/x86/msr_ipifuncs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: msr_ipifuncs.c,v 1.8 2007/03/25 02:44:29 xtraeme Exp $ */
+/* $NetBSD: msr_ipifuncs.c,v 1.9 2007/05/15 14:29:36 xtraeme Exp $ */
 
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: msr_ipifuncs.c,v 1.8 2007/03/25 02:44:29 xtraeme Exp $");
+__KERNEL_RCSID(0, "$NetBSD: msr_ipifuncs.c,v 1.9 2007/05/15 14:29:36 xtraeme Exp $");
 
 #include "opt_multiprocessor.h"
 
@@ -59,11 +59,8 @@ __KERNEL_RCSID(0, "$NetBSD: msr_ipifuncs.c,v 1.8 2007/03/25 02:44:29 xtraeme Exp
 #include <machine/intrdefs.h>
 
 static kmutex_t msr_mtx;
-static volatile uint64_t msr_setvalue;
-static volatile uint64_t msr_setmask;
-static volatile int msr_type;
-static volatile int msr_runcount;
-static volatile int msr_read;
+static volatile uint64_t msr_setvalue, msr_setmask;
+static volatile int msr_type, msr_runcount, msr_read;
 
 
 /*