--- xnu/xnu-792.6.56/libsa/bootstrap.cpp
+++ xnu/xnu-124.7/libsa/bootstrap.cpp
@@ -3,20 +3,19 @@
  *
  * @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. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * 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.
  * 
- * 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_LICENSE_HEADER_END@
  */
@@ -24,12 +23,13 @@
 #include <mach/kmod.h>
 #include <libkern/c++/OSDictionary.h>
 
-#include <libsa/kext.h>
+#include <libsa/kmod.h>
 #include <libsa/catalogue.h>
+extern "C" {
 #include <libsa/malloc.h>
+};
 
-#include "kld_patch.h"
-
+extern "C" {
 /*****
  * This function is used by IOCatalogue to load a kernel
  * extension. libsa initially sets it to be a function
@@ -50,6 +50,9 @@
  */
 extern int kernelLinkerPresent;
 
+extern IOLock * kld_lock;
+};
+
 
 class KLDBootstrap {
 public:
@@ -66,7 +69,8 @@
  */
 KLDBootstrap::KLDBootstrap() {
 
-    malloc_init();
+    kld_lock = IOLockAlloc();
+    IOLockLock(kld_lock);
 
     kmod_load_function = &load_kernel_extension;
 
@@ -75,6 +79,8 @@
     remove_startup_extension_function = &removeStartupExtension;
 
     kernelLinkerPresent = 1;
+
+    IOLockUnlock(kld_lock);
 }
 
 /* The destructor frees all wired memory regions held
@@ -82,15 +88,16 @@
  */
 KLDBootstrap::~KLDBootstrap() {
 
-    kld_file_cleanup_all_resources();
+    OSDictionary * startupExtensions;
 
-   /* Dump all device-tree entries for boot drivers, and all
-    * info on startup extensions. The IOCatalogue will now
-    * get personalities from kextd.
-    */
-    clearStartupExtensionsAndLoaderInfo();
+    IOLockLock(kld_lock);
 
-   /* Free all temporary malloc memory.
-    */
     malloc_reset();
+
+    startupExtensions = getStartupExtensions();
+    if (startupExtensions) startupExtensions->release();
+
+    IOLockUnlock(kld_lock);
+    IOLockFree(kld_lock);
+
 }