--- xnu/xnu-1504.7.4/libkern/c++/OSData.cpp
+++ xnu/xnu-792.17.14/libkern/c++/OSData.cpp
@@ -38,7 +38,7 @@
 #define super OSObject
 
 OSDefineMetaClassAndStructors(OSData, OSObject)
-OSMetaClassDefineReservedUsed(OSData, 0);    // setDeallocFunction
+OSMetaClassDefineReservedUnused(OSData, 0);
 OSMetaClassDefineReservedUnused(OSData, 1);
 OSMetaClassDefineReservedUnused(OSData, 2);
 OSMetaClassDefineReservedUnused(OSData, 3);
@@ -63,7 +63,7 @@
 
     if (data && (!inCapacity || capacity < inCapacity) ) {
         // clean out old data's storage if it isn't big enough
-        kfree(data, capacity);
+        kfree((vm_address_t) data, capacity);
         data = 0;
         ACCUMSIZE(-capacity);
     }
@@ -188,14 +188,9 @@
 void OSData::free()
 {
     if (capacity != EXTERNAL && data && capacity) {
-        kfree(data, capacity);
+        kfree((vm_offset_t)data, capacity);
         ACCUMSIZE( -capacity );
-    } else if (capacity == EXTERNAL) {
-	    DeallocFunction freemem = (DeallocFunction)reserved;
-		if (freemem && data && length) {
-			freemem(data, length);
-		}
-	}
+    }
     super::free();
 }
 
@@ -211,8 +206,6 @@
 {
     return capacityIncrement = increment; 
 }
-
-// xx-review: does not check for capacity == EXTERNAL
 
 unsigned int OSData::ensureCapacity(unsigned int newCapacity)
 {
@@ -230,7 +223,7 @@
         bzero(newData + capacity, newCapacity - capacity);
         if (data) {
             bcopy(data, newData, capacity);
-            kfree(data, capacity);
+            kfree((vm_offset_t)data, capacity);
         }
         ACCUMSIZE( newCapacity - capacity );
         data = (void *) newData;
@@ -328,11 +321,11 @@
 
 bool OSData::isEqualTo(const OSMetaClassBase *obj) const
 {
-    OSData *	otherData;
+    OSData *	data;
     OSString *  str;
 
-    if ((otherData = OSDynamicCast(OSData, obj)))
-        return isEqualTo(otherData);
+    if ((data = OSDynamicCast(OSData, obj)))
+        return isEqualTo(data);
     else if ((str = OSDynamicCast (OSString, obj)))
         return isEqualTo(str);
     else
@@ -430,12 +423,3 @@
 
     return s->addXMLEndTag("data");
 }
-
-/* Note I am just using the reserved pointer here instead of allocating a whole buffer
- * to hold one pointer.
- */
-void OSData::setDeallocFunction(DeallocFunction func)
-{
-    reserved = (ExpansionData *)func;
-	return;
-}