--- xnu/xnu-792.21.3/libkern/c++/OSMetaClass.cpp
+++ xnu/xnu-517.9.4/libkern/c++/OSMetaClass.cpp
@@ -1,33 +1,28 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * @APPLE_LICENSE_HEADER_START@
  * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
  * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
  * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ * @APPLE_LICENSE_HEADER_END@
  */
 /* OSMetaClass.cpp created by gvdl on Fri 1998-11-17 */
 
 #include <string.h>
+#include <sys/systm.h>
 
 #include <libkern/OSReturn.h>
 
@@ -46,8 +41,8 @@
 
 __BEGIN_DECLS
 
-#include <sys/systm.h>
 #include <mach/mach_types.h>
+#include <mach/etap_events.h>
 #include <kern/lock.h>
 #include <kern/clock.h>
 #include <kern/thread_call.h>
@@ -74,7 +69,7 @@
 
 static const int kClassCapacityIncrement = 40;
 static const int kKModCapacityIncrement = 10;
-static OSDictionary *sAllClassesDict, *sKModClassesDict, *sSortedByClassesDict;
+static OSDictionary *sAllClassesDict, *sKModClassesDict;
 
 static mutex_t *loadLock;
 static struct StalledData {
@@ -291,10 +286,8 @@
     do {
 	OSCollectionIterator *iter;
 
-	if (sAllClassesDict) {
+	if (sAllClassesDict)
 	    sAllClassesDict->removeObject(className);
-	    className->release();
-	}
 
 	iter = OSCollectionIterator::withCollection(sKModClassesDict);
 	if (!iter)
@@ -326,6 +319,7 @@
 		memmove(&sStalled->classes[i], &sStalled->classes[i+1],
 			    (sStalled->count - i) * sizeof(OSMetaClass *));
 	}
+	return;
     }
 }
 
@@ -351,7 +345,7 @@
 void *OSMetaClass::preModLoad(const char *kmodName)
 {
     if (!loadLock) {
-        loadLock = mutex_alloc(0);
+        loadLock = mutex_alloc(ETAP_IO_AHA);
 	mutex_lock(loadLock);
     }
     else
@@ -387,7 +381,6 @@
 {
     OSReturn result = kOSReturnSuccess;
     OSSet *kmodSet = 0;
-    OSSymbol *myname = 0;
 
     if (!sStalled || loadHandle != sStalled) {
 	logError(kOSMetaClassInternal);
@@ -404,8 +397,7 @@
     case kMakingDictionaries:
 	sKModClassesDict = OSDictionary::withCapacity(kKModCapacityIncrement);
 	sAllClassesDict = OSDictionary::withCapacity(kClassCapacityIncrement);
-	sSortedByClassesDict = OSDictionary::withCapacity(kClassCapacityIncrement);
-	if (!sAllClassesDict || !sKModClassesDict || !sSortedByClassesDict) {
+	if (!sAllClassesDict || !sKModClassesDict) {
 	    result = kOSMetaClassNoDicts;
 	    break;
 	}
@@ -414,7 +406,6 @@
     case kCompletedBootstrap:
     {
         unsigned int i;
-        myname = OSSymbol::withCStringNoCopy(sStalled->kmodName);
 
 	if (!sStalled->count)
 	    break;	// Nothing to do so just get out
@@ -438,20 +429,19 @@
 	    break;
 	}
 
-	if (!sKModClassesDict->setObject(myname, kmodSet)) {
+	if (!sKModClassesDict->setObject(sStalled->kmodName, kmodSet)) {
 	    result = kOSMetaClassNoInsKModSet;
 	    break;
 	}
 
 	// Second pass symbolling strings and inserting classes in dictionary
-	for (i = 0; i < sStalled->count; i++) {
+	for (unsigned int i = 0; i < sStalled->count; i++) {
 	    OSMetaClass *me = sStalled->classes[i];
 	    me->className = 
                 OSSymbol::withCStringNoCopy((const char *) me->className);
 
 	    sAllClassesDict->setObject(me->className, me);
 	    kmodSet->setObject(me);
-	    sSortedByClassesDict->setObject((const OSSymbol *)me, myname);
 	}
 	sBootstrapState = kCompletedBootstrap;
 	break;
@@ -464,9 +454,6 @@
 
     if (kmodSet)
 	kmodSet->release();
-
-	if (myname)
-	myname->release();
 
     if (sStalled) {
 	ACCUMSIZE(-(sStalled->capacity * sizeof(OSMetaClass *)
@@ -504,7 +491,7 @@
     bool result = false;
 
     if (!loadLock) {
-        loadLock = mutex_alloc(0);
+        loadLock = mutex_alloc(ETAP_IO_AHA);
 	mutex_lock(loadLock);
     }
     else
@@ -784,11 +771,6 @@
     return superClassLink;
 }
 
-const OSSymbol *OSMetaClass::getKmodName() const
-{	
-    return sSortedByClassesDict->getObject((const OSSymbol *)this);
-}
-
 unsigned int OSMetaClass::getInstanceCount() const
 {
     return instanceCount;