--- xnu/xnu-792.6.76/libsa/bootstrap.cpp
+++ xnu/xnu-124.1/libsa/bootstrap.cpp
@@ -23,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
@@ -49,6 +50,9 @@
  */
 extern int kernelLinkerPresent;
 
+extern IOLock * kld_lock;
+};
+
 
 class KLDBootstrap {
 public:
@@ -65,7 +69,8 @@
  */
 KLDBootstrap::KLDBootstrap() {
 
-    malloc_init();
+    kld_lock = IOLockAlloc();
+    IOLockLock(kld_lock);
 
     kmod_load_function = &load_kernel_extension;
 
@@ -74,6 +79,8 @@
     remove_startup_extension_function = &removeStartupExtension;
 
     kernelLinkerPresent = 1;
+
+    IOLockUnlock(kld_lock);
 }
 
 /* The destructor frees all wired memory regions held
@@ -81,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);
+
 }