--- a/usr/src/uts/i86pc/os/startup.c	Fri Aug 26 17:29:52 2005 -0700
+++ b/usr/src/uts/i86pc/os/startup.c	Sat Aug 27 15:17:06 2005 -0700
@@ -123,8 +123,8 @@
 #include <sys/cpc_impl.h>
 #include <sys/chip.h>
 #include <sys/x86_archext.h>
+#include <sys/smbios.h>
 
-extern void debug_enter(char *);
 extern void progressbar_init(void);
 extern void progressbar_start(void);
 
@@ -1870,8 +1870,6 @@
 void
 post_startup(void)
 {
-	extern void memscrub_init(void);
-
 	/*
 	 * Set the system wide, processor-specific flags to be passed
 	 * to userland via the aux vector for performance hints and
@@ -1880,9 +1878,15 @@
 	bind_hwcap();
 
 	/*
+	 * Load the System Management BIOS into the global ksmbios handle,
+	 * if an SMBIOS is present on this system.
+	 */
+	ksmbios = smbios_open(NULL, SMB_VERSION, ksmbios_flags, NULL);
+
+	/*
 	 * Startup memory scrubber.
 	 */
-	(void) memscrub_init();
+	memscrub_init();
 
 	/*
 	 * Perform forceloading tasks for /etc/system.
@@ -1890,12 +1894,6 @@
 	(void) mod_sysctl(SYS_FORCELOAD, NULL);
 
 	/*
-	 * complete mmu initialization, now that kernel and critical
-	 * modules have been loaded.
-	 */
-	(void) post_startup_mmu_initialization();
-
-	/*
 	 * ON4.0: Force /proc module in until clock interrupt handle fixed
 	 * ON4.0: This must be fixed or restated in /etc/systems.
 	 */