xnu-1486.2.11.tar.gz

[apple/xnu.git] / libkern / c++ / OSKext.cpp

diff --git a/libkern/c++/OSKext.cpp b/libkern/c++/OSKext.cpp
index e4c15bfc2bba1b54e51f92d7c5cb9e7ddcd851b2..9f41164919163edbcac23146f4fc6899191da70c 100644 (file)
--- a/libkern/c++/OSKext.cpp
+++ b/libkern/c++/OSKext.cpp
@@ -190,8 +190,6 @@ static IORecursiveLock    * sKextLock                  = NULL;
 static OSDictionary       * sKextsByID                 = NULL;
 static OSArray            * sLoadedKexts               = NULL;
 
-static OSArray            * sPrelinkedPersonalities    = NULL;
-
 // Requests to kextd waiting to be picked up.
 static OSArray            * sKernelRequests            = NULL;
 // Identifier of kext load requests in sKernelRequests
@@ -867,9 +865,8 @@ OSKext::setKextdActive(Boolean active)
 {
     IORecursiveLockLock(sKextLock);
     sKextdActive = active;
-    if (sPrelinkedPersonalities) {
-        gIOCatalogue->removePersonalities(sPrelinkedPersonalities);
-        OSSafeReleaseNULL(sPrelinkedPersonalities);
+    if (sKernelRequests->getCount()) {
+        OSKextPingKextd();
     }
     IORecursiveLockUnlock(sKextLock);
 
@@ -920,7 +917,7 @@ OSKext::willShutdown(void)
         goto finish;
     }
 
-        OSKextPingKextd();
+    OSKextPingKextd();
 
 finish:
     IORecursiveLockUnlock(sKextLock);
@@ -7089,7 +7086,7 @@ OSKext::requestResource(
         goto finish;
     }
 
-        OSKextPingKextd();
+    OSKextPingKextd();
 
     result = kOSReturnSuccess;
     if (requestTagOut) {
@@ -7670,20 +7667,6 @@ finish:
     return result;
 }
 
-/*********************************************************************
-*********************************************************************/
-/* static */
-void
-OSKext::setPrelinkedPersonalities(OSArray * personalitiesArray)
-{
-    sPrelinkedPersonalities = personalitiesArray;
-    if (sPrelinkedPersonalities) {
-        sPrelinkedPersonalities->retain();
-        gIOCatalogue->addDrivers(sPrelinkedPersonalities);
-    }
-    return;
-}
-
 /*********************************************************************
 *********************************************************************/
 /* static */