--- xnu/xnu-792.21.3/iokit/Kernel/IOStartIOKit.cpp
+++ xnu/xnu-1228/iokit/Kernel/IOStartIOKit.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -43,6 +43,7 @@
 #include <IOKit/IOLib.h>
 #include <IOKit/IOKitKeys.h>
 #include <IOKit/IOKitDebug.h>
+#include <IOKit/pwr_mgt/IOPMinformeeList.h>
 
 #include <IOKit/assert.h>
 
@@ -51,10 +52,12 @@
 extern "C" {
 
 extern void OSlibkernInit (void);
+extern void ml_hpet_cfg(uint32_t, uint32_t);
 
 #include <kern/clock.h>
-
-void IOKitResetTime( void )
+#include <sys/time.h>
+
+void IOKitInitializeTime( void )
 {
 	mach_timespec_t		t;
 
@@ -62,13 +65,25 @@
 	t.tv_nsec = 0;
 	IOService::waitForService(
 		IOService::resourceMatching("IORTC"), &t );
-#ifndef i386
+#ifdef ppc
 	IOService::waitForService(
 		IOService::resourceMatching("IONVRAM"), &t );
 #endif
 
     clock_initialize_calendar();
 }
+
+void IOKitResetTime( void )
+{
+    uint32_t secs, microsecs;
+
+    clock_initialize_calendar();
+
+    clock_get_calendar_microtime(&secs, &microsecs);
+    gIOLastWakeTime.tv_sec  = secs;
+    gIOLastWakeTime.tv_usec = microsecs;
+}
+
 
 // From <osfmk/kern/debug.c>
 extern int debug_mode;
@@ -156,6 +171,9 @@
     IOUserClient::initialize();
     IOMemoryDescriptor::initialize();
 
+    // Initializes IOPMinformeeList class-wide shared lock
+    IOPMinformeeList::getSharedRecursiveLock();
+
     obj = OSString::withCString( version );
     assert( obj );
     if( obj ) {
@@ -179,7 +197,32 @@
         gIOCatalogue->recordStartupExtensions();
 
         rootNub->registerService();
-    }
+
+#if !NO_KEXTD
+       /* Add a busy count to keep the registry busy until kextd has
+        * completely finished launching. This is decremented when kextd
+        * messages the kernel after the in-kernel linker has been
+        * removed and personalities have been sent.
+        */
+        IOService::getServiceRoot()->adjustBusy(1);
+#endif
+    }
+}
+
+void
+IORegistrySetOSBuildVersion(char * build_version)
+{
+    IORegistryEntry * root = IORegistryEntry::getRegistryRoot();
+
+    if (root) {
+        if (build_version) {
+            root->setProperty(kOSBuildVersionKey, build_version);
+        } else {
+            root->removeProperty(kOSBuildVersionKey);
+        }
+    }
+
+    return;
 }
 
 }; /* extern "C" */