--- xnu/xnu-344/libkern/c++/OSMetaClass.cpp
+++ xnu/xnu-124.1/libkern/c++/OSMetaClass.cpp
@@ -46,7 +46,6 @@
 #include <kern/lock.h>
 #include <kern/clock.h>
 #include <kern/thread_call.h>
-#include <kern/host.h>
 #include <mach/kmod.h>
 #include <mach/mach_interface.h>
 
@@ -85,16 +84,12 @@
 static const char OSMetaClassBasePanicMsg[] =
     "OSMetaClassBase::_RESERVEDOSMetaClassBase%d called\n";
 
-#if SLOT_USED
 void OSMetaClassBase::_RESERVEDOSMetaClassBase0()
     { panic(OSMetaClassBasePanicMsg, 0); }
 void OSMetaClassBase::_RESERVEDOSMetaClassBase1()
     { panic(OSMetaClassBasePanicMsg, 1); }
 void OSMetaClassBase::_RESERVEDOSMetaClassBase2()
     { panic(OSMetaClassBasePanicMsg, 2); }
-#endif /* SLOT_USED */
-
-// As these slots are used move them up inside the #if above
 void OSMetaClassBase::_RESERVEDOSMetaClassBase3()
     { panic(OSMetaClassBasePanicMsg, 3); }
 void OSMetaClassBase::_RESERVEDOSMetaClassBase4()
@@ -103,28 +98,6 @@
     { panic(OSMetaClassBasePanicMsg, 5); }
 void OSMetaClassBase::_RESERVEDOSMetaClassBase6()
     { panic(OSMetaClassBasePanicMsg, 6); }
-    
-/*
- * These used to be inline in the header but gcc didn't believe us
- * Now we MUST pull the inline out at least until the compiler is
- * repaired.
- */
-// Helper inlines for runtime type preprocessor macros
-OSMetaClassBase *OSMetaClassBase::
-safeMetaCast(const OSMetaClassBase *me, const OSMetaClass *toType)
-    { return (me)? me->metaCast(toType) : 0; }
-
-bool OSMetaClassBase::
-checkTypeInst(const OSMetaClassBase *inst, const OSMetaClassBase *typeinst)
-{
-    const OSMetaClass *toType = OSTypeIDInst(typeinst);
-    return typeinst && inst && (0 != inst->metaCast(toType));
-}
-
-
-// If you need this slot you had better setup an IOCTL style interface.
-// 'Cause the whole kernel world depends on OSMetaClassBase and YOU
-// CANT change the VTABLE size ever.
 void OSMetaClassBase::_RESERVEDOSMetaClassBase7()
     { panic(OSMetaClassBasePanicMsg, 7); }
 
@@ -168,7 +141,7 @@
 
 OSMetaClassBase *OSMetaClassBase::metaCast(const char *toMetaCStr) const
 {
-    const OSSymbol *tempSymb = OSSymbol::withCString(toMetaCStr);
+    const OSSymbol *tempSymb = OSSymbol::withCStringNoCopy(toMetaCStr);
     OSMetaClassBase *ret = 0;
     if (tempSymb) {
         ret = metaCast(tempSymb);
@@ -323,13 +296,12 @@
     }
 }
 
+// Don't do anything as these classes must be statically allocated
 void *OSMetaClass::operator new(size_t size) { return 0; }
+void OSMetaClass::operator delete(void *mem, size_t size) { }
 void OSMetaClass::retain() const { }
 void OSMetaClass::release() const { }
-void OSMetaClass::release(int when) const { }
-void OSMetaClass::taggedRetain(const void *tag) const { }
-void OSMetaClass::taggedRelease(const void *tag) const { }
-void OSMetaClass::taggedRelease(const void *tag, const int when) const { }
+void OSMetaClass::release(int when) const { };
 int  OSMetaClass::getRetainCount() const { return 0; }
 
 const char *OSMetaClass::getClassName() const
@@ -346,10 +318,10 @@
 {
     if (!loadLock) {
         loadLock = mutex_alloc(ETAP_IO_AHA);
-	mutex_lock(loadLock);
+	_mutex_lock(loadLock);
     }
     else
-	mutex_lock(loadLock);
+	_mutex_lock(loadLock);
 
     sStalled = (StalledData *) kalloc(sizeof(*sStalled));
     if (sStalled) {
@@ -492,10 +464,10 @@
 
     if (!loadLock) {
         loadLock = mutex_alloc(ETAP_IO_AHA);
-	mutex_lock(loadLock);
+	_mutex_lock(loadLock);
     }
     else
-	mutex_lock(loadLock);
+	_mutex_lock(loadLock);
 
     do {
 	OSSet *kmodClasses;
@@ -559,11 +531,11 @@
     OSCollectionIterator *kmods;
     OSCollectionIterator *classes;
     OSMetaClass *checkClass;
-    kmod_info_t *ki = 0;
+    kmod_info_t *ki;
     kern_return_t ret;
     bool didUnload;
 
-    mutex_lock(loadLock);
+    _mutex_lock(loadLock);
 
     do {
 
@@ -574,18 +546,12 @@
         didUnload = false;
         while ( (kmodName = (OSSymbol *) kmods->getNextObject()) ) {
 
-            if (ki) {
-                kfree(ki, sizeof(kmod_info_t));
-                ki = 0;
-            }
-
-            ki = kmod_lookupbyname_locked((char *)kmodName->getCStringNoCopy());
+            ki = kmod_lookupbyname((char *)kmodName->getCStringNoCopy());
             if (!ki)
                 continue;
 
-            if (ki->reference_count) {
-                 continue;
-            }
+            if (ki->reference_count)
+                continue;
 
             kmodClasses = OSDynamicCast(OSSet,
                                 sKModClassesDict->getObject(kmodName));
@@ -604,7 +570,7 @@
                 didUnload = true;
             }
 
-        }
+        } while (false);
 
         kmods->release();
 
@@ -618,7 +584,7 @@
     static thread_call_t unloadCallout;
     AbsoluteTime when;
 
-    mutex_lock(loadLock);
+    _mutex_lock(loadLock);
 
     if (!unloadCallout)
         unloadCallout = thread_call_allocate(&_OSMetaClassConsiderUnloads, 0);
@@ -664,7 +630,7 @@
 OSObject *OSMetaClass::allocClassWithName(const OSSymbol *name)
 {
     OSObject * result;
-    mutex_lock(loadLock);
+    _mutex_lock(loadLock);
 
     const OSMetaClass * const meta = getMetaClassWithName(name);
 
@@ -699,7 +665,7 @@
 checkMetaCastWithName(const OSSymbol *name, const OSMetaClassBase *in)
 {
     OSMetaClassBase * result;
-    mutex_lock(loadLock);
+    _mutex_lock(loadLock);
     const OSMetaClass * const meta = getMetaClassWithName(name);
 
     if (meta)