--- xnu/xnu-12377.101.15/libkern/c++/OSString.cpp
+++ xnu/xnu-8019.61.5/libkern/c++/OSString.cpp
@@ -82,8 +82,7 @@
 	}
 
 	newLength++;
-	newString = (char *)kalloc_data(newLength,
-	    Z_VM_TAG_BT(Z_WAITOK, VM_KERN_MEMORY_LIBKERN));
+	newString = (char *)kalloc_data_container(newLength, Z_WAITOK);
 	if (!newString) {
 		return false;
 	}
@@ -91,7 +90,7 @@
 	bcopy(cString, newString, newLength);
 
 	if (!(flags & kOSStringNoCopy) && string) {
-		kfree_data(string, length);
+		kfree_data_container(string, length);
 		OSCONTAINER_ACCUMSIZE(-((size_t)length));
 	}
 	string = newString;
@@ -125,8 +124,7 @@
 	}
 
 	newLength = (unsigned int) (inlength + 1);
-	newString = (char *)kalloc_data(newLength,
-	    Z_VM_TAG_BT(Z_WAITOK, VM_KERN_MEMORY_LIBKERN));
+	newString = (char *)kalloc_data_container(newLength, Z_WAITOK);
 	if (!newString) {
 		return false;
 	}
@@ -135,7 +133,7 @@
 	newString[inlength] = 0;
 
 	if (!(flags & kOSStringNoCopy) && string) {
-		kfree_data(string, length);
+		kfree_data_container(string, length);
 		OSCONTAINER_ACCUMSIZE(-((size_t)length));
 	}
 
@@ -250,7 +248,7 @@
 OSString::free()
 {
 	if (!(flags & kOSStringNoCopy) && string) {
-		kfree_data(string, length);
+		kfree_data_container(string, length);
 		OSCONTAINER_ACCUMSIZE(-((size_t)length));
 	}