--- xnu/xnu-2422.100.13/iokit/Kernel/IOBufferMemoryDescriptor.cpp
+++ xnu/xnu-1699.24.8/iokit/Kernel/IOBufferMemoryDescriptor.cpp
@@ -35,24 +35,8 @@
 #include <IOKit/IOMapper.h>
 #include <IOKit/IOBufferMemoryDescriptor.h>
 #include <libkern/OSDebug.h>
-#include <mach/mach_vm.h>
 
 #include "IOKitKernelInternal.h"
-
-#ifdef IOALLOCDEBUG
-#include <libkern/c++/OSCPPDebug.h>
-#endif
-#include <IOKit/IOStatisticsPrivate.h>
-
-#if IOKITSTATS
-#define IOStatisticsAlloc(type, size) \
-do { \
-	IOStatistics::countAlloc(type, size); \
-} while (0)
-#else
-#define IOStatisticsAlloc(type, size)
-#endif /* IOKITSTATS */
-
 
 __BEGIN_DECLS
 void ipc_port_release_send(ipc_port_t port);
@@ -64,9 +48,8 @@
 
 enum
 {
-    kInternalFlagPhysical      = 0x00000001,
-    kInternalFlagPageSized     = 0x00000002,
-    kInternalFlagPageAllocated = 0x00000004
+    kInternalFlagPhysical  = 0x00000001,
+    kInternalFlagPageSized = 0x00000002
 };
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -74,23 +57,6 @@
 #define super IOGeneralMemoryDescriptor
 OSDefineMetaClassAndStructors(IOBufferMemoryDescriptor,
 				IOGeneralMemoryDescriptor);
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-static uintptr_t IOBMDPageProc(iopa_t * a)
-{
-    kern_return_t kr;
-    vm_address_t  vmaddr  = 0;
-    int           options = 0; // KMA_LOMEM;
-
-    kr = kernel_memory_allocate(kernel_map, &vmaddr,
-				page_size, 0, options);
-
-    if (KERN_SUCCESS != kr) vmaddr = 0;
-    else 		    bzero((void *) vmaddr, page_size);
-
-    return ((uintptr_t) vmaddr);
-}
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
@@ -113,14 +79,11 @@
 				mach_vm_address_t alignment,
 				mach_vm_address_t physicalMask)
 {
-    kern_return_t 	  kr;
-    task_t		  mapTask = NULL;
-    vm_map_t 		  vmmap = NULL;
-    mach_vm_address_t     highestMask = 0;
-    IOOptionBits	  iomdOptions = kIOMemoryTypeVirtual64 | kIOMemoryAsReference;
-    IODMAMapSpecification mapSpec;
-    bool                  mapped = false;
-    bool                  needZero;
+    kern_return_t 	kr;
+    task_t		mapTask = NULL;
+    vm_map_t 		vmmap = NULL;
+    mach_vm_address_t   highestMask = 0;
+    IOOptionBits	iomdOptions = kIOMemoryTypeVirtual64 | kIOMemoryAsReference;
 
     if (!capacity)
         return false;
@@ -136,18 +99,9 @@
 	return (false);
     _ranges.v64->address = 0;
     _ranges.v64->length  = 0;
-    //  make sure super::free doesn't dealloc _ranges before super::init
-    _flags = kIOMemoryAsReference;
 
     // Grab IOMD bits from the Buffer MD options
     iomdOptions  |= (options & kIOBufferDescriptorMemoryFlags);
-
-    if (!(kIOMemoryMapperNone & options))
-    {
-	IOMapper::checkForSystemMapper();
-	mapped = (0 != IOMapper::gSystem);
-    }
-    needZero = mapped;
 
     if (physicalMask && (alignment <= 1))
     {
@@ -172,18 +126,6 @@
     if ((inTask != kernel_task) && !(options & kIOMemoryPageable))
 	return false;
 
-    bzero(&mapSpec, sizeof(mapSpec));
-    mapSpec.alignment      = _alignment;
-    mapSpec.numAddressBits = 64;
-    if (highestMask && mapped)
-    {
-	if (highestMask <= 0xFFFFFFFF)
-	    mapSpec.numAddressBits = (32 - __builtin_clz((unsigned int) highestMask));
-	else
-	    mapSpec.numAddressBits = (64 - __builtin_clz((unsigned int) (highestMask >> 32)));
-	highestMask = 0;
-    }
-
     // set flags for entry + object create
     vm_prot_t memEntryCacheMode = VM_PROT_READ | VM_PROT_WRITE;
 
@@ -204,10 +146,6 @@
 
 	case kIOMapCopybackCache:
 	    SET_MAP_MEM(MAP_MEM_COPYBACK, memEntryCacheMode);
-	    break;
-
-	case kIOMapCopybackInnerCache:
-	    SET_MAP_MEM(MAP_MEM_INNERWBACK, memEntryCacheMode);
 	    break;
 
 	case kIOMapDefaultCache:
@@ -239,19 +177,7 @@
 
 	/* Allocate a wired-down buffer inside kernel space. */
 
-	bool contig = (0 != (options & kIOMemoryHostPhysicallyContiguous));
-
-	if (!contig && (0 != (options & kIOMemoryPhysicallyContiguous)))
-	{
-	    contig |= (!mapped);
-	    contig |= (0 != (kIOMemoryMapperNone & options));
-#if 0
-	    // treat kIOMemoryPhysicallyContiguous as kIOMemoryHostPhysicallyContiguous for now
-	    contig |= true;
-#endif
-	}
-
-	if (contig || highestMask || (alignment > page_size))
+	if ((options & kIOMemoryPhysicallyContiguous) || highestMask || (alignment > page_size))
 	{
             _internalFlags |= kInternalFlagPhysical;
             if (highestMask)
@@ -259,22 +185,8 @@
                 _internalFlags |= kInternalFlagPageSized;
                 capacity = round_page(capacity);
             }
-            _buffer = (void *) IOKernelAllocateWithPhysicalRestrict(
-            				capacity, highestMask, alignment, contig);
-	}
-	else if (needZero
-		  && ((capacity + alignment) <= (page_size - kIOPageAllocChunkBytes)))
-	{
-            _internalFlags |= kInternalFlagPageAllocated;
-            needZero        = false;
-            _buffer         = (void *) iopa_alloc(&gIOBMDPageAllocator, &IOBMDPageProc, capacity, alignment);
-	    if (_buffer)
-	    {
-		IOStatisticsAlloc(kIOStatisticsMallocAligned, capacity);
-#if IOALLOCDEBUG
-		debug_iomalloc_size += capacity;
-#endif
-	    }
+            _buffer = (void *) IOKernelAllocateWithPhysicalRestrict(capacity, highestMask, alignment, 
+                                        (0 != (options & kIOMemoryPhysicallyContiguous)));
 	}
 	else if (alignment > 1)
 	{
@@ -284,11 +196,11 @@
 	{
             _buffer = IOMalloc(capacity);
 	}
+
 	if (!_buffer)
 	{
             return false;
 	}
-	if (needZero) bzero(_buffer, capacity);
     }
 
     if( (options & (kIOMemoryPageable | kIOMapCacheMask))) {
@@ -325,10 +237,9 @@
 
 	    while (startAddr < endAddr)
 	    {
-		UInt8 dummyVar = *startAddr;
-		(void) dummyVar;
+		*startAddr;
 		startAddr += page_size;
- 	    }
+	    }
 	}
     }
 
@@ -337,11 +248,6 @@
 
     if (!super::initWithOptions(_ranges.v64, 1, 0,
 				inTask, iomdOptions, /* System mapper */ 0))
-	return false;
-
-    // give any system mapper the allocation params
-    if (kIOReturnSuccess != dmaCommandOperation(kIOMDAddDMAMapSpec, 
-    						&mapSpec, sizeof(mapSpec)))
 	return false;
 
     if (mapTask)
@@ -549,33 +455,16 @@
     }
     else if (buffer)
     {
-	if (kInternalFlagPageSized & internalFlags) size = round_page(size);
-
-        if (kInternalFlagPhysical & internalFlags)
+        if (internalFlags & kInternalFlagPhysical)
         {
+            if (kInternalFlagPageSized & internalFlags)
+                size = round_page(size);
             IOKernelFreePhysical((mach_vm_address_t) buffer, size);
-	}
-	else if (kInternalFlagPageAllocated & internalFlags)
-	{
-	    uintptr_t page;
-            page = iopa_free(&gIOBMDPageAllocator, (uintptr_t) buffer, size);
-	    if (page)
-	    {
-		kmem_free(kernel_map, page, page_size);
-	    }
-#if IOALLOCDEBUG
-	    debug_iomalloc_size -= size;
-#endif
-	    IOStatisticsAlloc(kIOStatisticsFreeAligned, size);
-	}
+        }
         else if (alignment > 1)
-	{
             IOFreeAligned(buffer, size);
-	}
         else
-	{
             IOFree(buffer, size);
-	}
     }
     if (range && (kIOMemoryAsReference & flags))
 	IODelete(range, IOAddressRange, 1);