--- xnu/xnu-517.7.21/iokit/Kernel/IOStartIOKit.cpp
+++ xnu/xnu-201.19/iokit/Kernel/IOStartIOKit.cpp
@@ -46,24 +46,69 @@
 
 #include <kern/clock.h>
 
+/*XXX power management hacks XXX*/
+#include <IOKit/IOReturn.h>
+#include <IOKit/IOMessage.h>
+
+extern void *registerSleepWakeInterest(
+						void		*callback,
+						void		*target,
+						void		*refCon);
+/*XXX power management hacks XXX*/
+
+static void
+calend_wakeup_resynch(
+	thread_call_param_t		p0,
+	thread_call_param_t		p1)
+{
+	void		IOKitResetTime(void);
+
+	IOKitResetTime();
+}
+
+static thread_call_t	calend_sleep_wake_call;
+
+static IOReturn
+calend_sleep_wake_notif(
+	void			*target,
+	void			*refCon,
+	unsigned int	messageType,
+	void			*provider,
+	void			*messageArg,
+	vm_size_t		argSize)
+{
+	if (messageType != kIOMessageSystemHasPoweredOn)
+		return (kIOReturnUnsupported);
+
+	if (calend_sleep_wake_call != NULL)
+		thread_call_enter(calend_sleep_wake_call);
+
+	return (kIOReturnSuccess);
+}
+
 void IOKitResetTime( void )
 {
-	mach_timespec_t		t;
-
-	t.tv_sec = 30;
-	t.tv_nsec = 0;
-	IOService::waitForService(
-		IOService::resourceMatching("IORTC"), &t );
+    mach_timespec_t	t;
+
+    t.tv_sec = 30;
+    t.tv_nsec = 0;
+    IOService::waitForService(
+        IOService::resourceMatching("IORTC"), &t );
 #ifndef i386
-	IOService::waitForService(
-		IOService::resourceMatching("IONVRAM"), &t );
+    IOService::waitForService(
+        IOService::resourceMatching("IONVRAM"), &t );
 #endif
 
+	if (calend_sleep_wake_call == NULL) {
+		calend_sleep_wake_call = thread_call_allocate(
+											calend_wakeup_resynch, NULL);
+
+		registerSleepWakeInterest(calend_sleep_wake_notif, NULL, NULL);
+	}
+
     clock_initialize_calendar();
 }
 
-// From <osfmk/kern/debug.c>
-extern int debug_mode;
 
 void StartIOKit( void * p1, void * p2, void * p3, void * p4 )
 {
@@ -81,11 +126,6 @@
 
     if( PE_parse_boot_arg( "io", &debugFlags ))
 	gIOKitDebug = debugFlags;
-
-    // Check for the log synchronous bit set in io
-    if (gIOKitDebug & kIOLogSynchronous)
-        debug_mode = true;
-
     //
     // Have to start IOKit environment before we attempt to start
     // the C++ runtime environment.  At some stage we have to clean up
@@ -95,6 +135,9 @@
     //
     IOLibInit(); 
     OSlibkernInit();
+
+    IOLog("_cppInit done\n");
+
 
    /*****
     * Declare the fake kmod_info structs for built-in components