--- xnu/xnu-792.18.15/libkern/c++/OSMetaClass.cpp
+++ xnu/xnu-792.21.3/libkern/c++/OSMetaClass.cpp
@@ -44,9 +44,6 @@
 #include <libkern/c++/OSLib.h>
 #include <libkern/OSAtomic.h>
 
-#include <IOKit/pwr_mgt/RootDomain.h>
-#include <IOKit/IOMessage.h>
-
 __BEGIN_DECLS
 
 #include <sys/systm.h>
@@ -79,7 +76,7 @@
 static const int kKModCapacityIncrement = 10;
 static OSDictionary *sAllClassesDict, *sKModClassesDict, *sSortedByClassesDict;
 
-static mutex_t *loadLock = 0;
+static mutex_t *loadLock;
 static struct StalledData {
     const char *kmodName;
     OSReturn result;
@@ -89,8 +86,6 @@
 } *sStalled;
 
 static unsigned int sConsiderUnloadDelay = 60;	/* secs */
-static bool unloadsEnabled = true;  // set to false when system going to sleep
-static thread_call_t unloadCallout = 0;
 
 static const char OSMetaClassBasePanicMsg[] =
     "OSMetaClassBase::_RESERVEDOSMetaClassBase%d called\n";
@@ -283,7 +278,7 @@
 
 	    sStalled->capacity += kKModCapacityIncrement;
 	    memmove(sStalled->classes, oldStalled, oldSize);
-	    kfree(oldStalled, oldSize);
+	    kfree((vm_offset_t)oldStalled, oldSize);
 	    ACCUMSIZE(newSize - oldSize);
 	}
 
@@ -367,7 +362,7 @@
 	sStalled->classes  = (OSMetaClass **)
 			kalloc(kKModCapacityIncrement * sizeof(OSMetaClass *));
 	if (!sStalled->classes) {
-	    kfree(sStalled, sizeof(*sStalled));
+	    kfree((vm_offset_t) sStalled, sizeof(*sStalled));
 	    return 0;
 	}
 	ACCUMSIZE((kKModCapacityIncrement * sizeof(OSMetaClass *)) + sizeof(*sStalled));
@@ -419,7 +414,7 @@
     case kCompletedBootstrap:
     {
         unsigned int i;
-        myname = (OSSymbol *)OSSymbol::withCStringNoCopy(sStalled->kmodName);
+        myname = OSSymbol::withCStringNoCopy(sStalled->kmodName);
 
 	if (!sStalled->count)
 	    break;	// Nothing to do so just get out
@@ -476,9 +471,9 @@
     if (sStalled) {
 	ACCUMSIZE(-(sStalled->capacity * sizeof(OSMetaClass *)
 		     + sizeof(*sStalled)));
-	kfree(sStalled->classes,
+	kfree((vm_offset_t) sStalled->classes,
 	      sStalled->capacity * sizeof(OSMetaClass *));
-	kfree(sStalled, sizeof(*sStalled));
+	kfree((vm_offset_t) sStalled, sizeof(*sStalled));
 	sStalled = 0;
     }
 
@@ -568,34 +563,6 @@
 
     iter->release();
 }
-
-
-extern "C" {
-
-IOReturn OSMetaClassSystemSleepOrWake(UInt32 messageType)
-{
-    mutex_lock(loadLock);
-
-   /* If the system is going to sleep, cancel the reaper thread timer
-    * and mark unloads disabled in case it just fired but hasn't
-    * taken the lock yet. If we are coming back from sleep, just
-    * set unloads enabled; IOService's normal operation will cause
-    * unloads to be considered soon enough.
-    */
-    if (messageType == kIOMessageSystemWillSleep) {
-        if (unloadCallout) {
-            thread_call_cancel(unloadCallout);
-        }
-        unloadsEnabled = false;
-    } else if (messageType == kIOMessageSystemHasPoweredOn) {
-        unloadsEnabled = true;
-    }
-    mutex_unlock(loadLock);
-
-    return kIOReturnSuccess;
-}
-
-};
 
 extern "C" kern_return_t kmod_unload_cache(void);
 
@@ -613,11 +580,6 @@
 
     mutex_lock(loadLock);
 
-    if (!unloadsEnabled) {
-        mutex_unlock(loadLock);
-        return;
-    }
-
     do {
 
 	kmods = OSCollectionIterator::withCollection(sKModClassesDict);
@@ -628,7 +590,7 @@
         while ( (kmodName = (OSSymbol *) kmods->getNextObject()) ) {
 
             if (ki) {
-                kfree(ki, sizeof(kmod_info_t));
+                kfree((vm_offset_t) ki, sizeof(kmod_info_t));
                 ki = 0;
             }
 
@@ -670,6 +632,7 @@
 
 void OSMetaClass::considerUnloads()
 {
+    static thread_call_t unloadCallout;
     AbsoluteTime when;
 
     mutex_lock(loadLock);
@@ -823,7 +786,7 @@
 
 const OSSymbol *OSMetaClass::getKmodName() const
 {	
-    return (const OSSymbol *)sSortedByClassesDict->getObject((OSSymbol *)this);
+    return sSortedByClassesDict->getObject((const OSSymbol *)this);
 }
 
 unsigned int OSMetaClass::getInstanceCount() const