Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/arch/i386/i386/machdep.c,v
retrieving revision 1.586.2.3
retrieving revision 1.586.2.4
diff -u -p -r1.586.2.3 -r1.586.2.4
--- src/sys/arch/i386/i386/machdep.c	2007/03/28 20:25:36	1.586.2.3
+++ src/sys/arch/i386/i386/machdep.c	2007/04/20 20:31:25	1.586.2.4
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.586.2.3 2007/03/28 20:25:36 jdc Exp $	*/
+/*	$NetBSD: machdep.c,v 1.586.2.4 2007/04/20 20:31:25 bouyer Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2000, 2004, 2006 The NetBSD Foundation, Inc.
@@ -72,7 +72,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.586.2.3 2007/03/28 20:25:36 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.586.2.4 2007/04/20 20:31:25 bouyer Exp $");
 
 #include "opt_beep.h"
 #include "opt_compat_ibcs2.h"
@@ -132,6 +132,8 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 
 
 #include <sys/sysctl.h>
 
+#include <x86/cpu_msr.h>
+
 #include <machine/cpu.h>
 #include <machine/cpufunc.h>
 #include <machine/cpuvar.h>
@@ -481,6 +483,8 @@ cpu_startup()
 
 	/* Safe for i/o port / memory space allocation to use malloc now. */
 	x86_bus_space_mallocok();
+
+	x86_init();
 }
 
 /*