--- xnu/xnu-792.17.14/libsa/bootstrap.cpp
+++ xnu/xnu-201.19/libsa/bootstrap.cpp
@@ -1,40 +1,37 @@
 /*
  * 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@
  */
 #include <IOKit/IOLib.h>
 #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
@@ -54,6 +51,7 @@
  * about loading and matching drivers.
  */
 extern int kernelLinkerPresent;
+};
 
 
 class KLDBootstrap {
@@ -70,8 +68,6 @@
  * table for functions used to record and load kmods.
  */
 KLDBootstrap::KLDBootstrap() {
-
-    malloc_init();
 
     kmod_load_function = &load_kernel_extension;