--- xnu/xnu-3248.50.21/libkern/c++/OSData.cpp
+++ xnu/xnu-2782.30.5/libkern/c++/OSData.cpp
@@ -49,30 +49,32 @@
 
 #define EXTERNAL ((unsigned int) -1)
 
+#if OSALLOCDEBUG
+extern int debug_container_malloc_size;
+#define ACCUMSIZE(s) do { debug_container_malloc_size += (s); } while(0)
+#else
+#define ACCUMSIZE(s)
+#endif
+
 bool OSData::initWithCapacity(unsigned int inCapacity)
 {
-    if (data)
-    {
-        OSCONTAINER_ACCUMSIZE(-((size_t)capacity));
-	if (!inCapacity || (capacity < inCapacity))
-	{
-	    // clean out old data's storage if it isn't big enough
-	    kfree(data, capacity);
-	    data = 0;
-	    capacity = 0;
-	}
-    }
-
     if (!super::init())
         return false;
 
+    if (data && (!inCapacity || capacity < inCapacity) ) {
+        // clean out old data's storage if it isn't big enough
+        kfree(data, capacity);
+        data = 0;
+        ACCUMSIZE(-capacity);
+    }
+
     if (inCapacity && !data) {
-        data = (void *) kalloc_container(inCapacity);
+        data = (void *) kalloc(inCapacity);
         if (!data)
             return false;
         capacity = inCapacity;
-    }
-    OSCONTAINER_ACCUMSIZE(capacity);
+        ACCUMSIZE(inCapacity);
+    }
 
     length = 0;
     if (inCapacity < 16)
@@ -187,7 +189,7 @@
 {
     if (capacity != EXTERNAL && data && capacity) {
         kfree(data, capacity);
-        OSCONTAINER_ACCUMSIZE( -((size_t)capacity) );
+        ACCUMSIZE( -capacity );
     } else if (capacity == EXTERNAL) {
 	DeallocFunction freemem = reserved ? reserved->deallocFunction : NULL;
 	if (freemem && data && length) {
@@ -228,7 +230,7 @@
     if (finalCapacity < newCapacity)
         return capacity;
 
-    newData = (unsigned char *) kalloc_container(finalCapacity);
+    newData = (unsigned char *) kalloc(finalCapacity);
 
     if ( newData ) {
         bzero(newData + capacity, finalCapacity - capacity);
@@ -236,7 +238,7 @@
             bcopy(data, newData, capacity);
             kfree(data, capacity);
         }
-        OSCONTAINER_ACCUMSIZE( ((size_t)finalCapacity) - ((size_t)capacity) );
+        ACCUMSIZE( finalCapacity - capacity );
         data = (void *) newData;
         capacity = finalCapacity;
     }
@@ -443,7 +445,7 @@
 {
     if (!reserved)
     {
-    	reserved = (typeof(reserved)) kalloc_container(sizeof(ExpansionData));
+    	reserved = (typeof(reserved)) kalloc(sizeof(ExpansionData));
         if (!reserved) return;
         bzero(reserved, sizeof(ExpansionData));
     }
@@ -454,7 +456,7 @@
 {
     if (!reserved)
     {
-    	reserved = (typeof(reserved)) kalloc_container(sizeof(ExpansionData));
+    	reserved = (typeof(reserved)) kalloc(sizeof(ExpansionData));
 	if (!reserved) return;
 	bzero(reserved, sizeof(ExpansionData));
     }