Loading...
iokit/Kernel/IOSharedDataQueue.cpp xnu-8020.101.4 xnu-11417.121.6
--- xnu/xnu-8020.101.4/iokit/Kernel/IOSharedDataQueue.cpp
+++ xnu/xnu-11417.121.6/iokit/Kernel/IOSharedDataQueue.cpp
@@ -34,6 +34,8 @@
 #include <IOKit/IOMemoryDescriptor.h>
 #include <libkern/c++/OSSharedPtr.h>
 
+#include <vm/vm_kern_xnu.h>
+
 #ifdef enqueue
 #undef enqueue
 #endif
@@ -79,6 +81,7 @@
 {
 	IODataQueueAppendix *   appendix;
 	vm_size_t               allocSize;
+	kern_return_t           kr;
 
 	if (!super::init()) {
 		return false;
@@ -99,11 +102,11 @@
 		return false;
 	}
 
-	dataQueue = (IODataQueueMemory *)IOMallocAligned(allocSize, PAGE_SIZE);
-	if (dataQueue == NULL) {
-		return false;
-	}
-	bzero(dataQueue, allocSize);
+	kr = kmem_alloc(kernel_map, (vm_offset_t *)&dataQueue, allocSize,
+	    (kma_flags_t)(KMA_DATA | KMA_ZERO), IOMemoryTag(kernel_map));
+	if (kr != KERN_SUCCESS) {
+		return false;
+	}
 
 	dataQueue->queueSize    = size;
 //  dataQueue->head         = 0;
@@ -133,7 +136,8 @@
 IOSharedDataQueue::free()
 {
 	if (dataQueue) {
-		IOFreeAligned(dataQueue, round_page(getQueueSize() + DATA_QUEUE_MEMORY_HEADER_SIZE + DATA_QUEUE_MEMORY_APPENDIX_SIZE));
+		kmem_free(kernel_map, (vm_offset_t)dataQueue, round_page(getQueueSize() +
+		    DATA_QUEUE_MEMORY_HEADER_SIZE + DATA_QUEUE_MEMORY_APPENDIX_SIZE));
 		dataQueue = NULL;
 		if (notifyMsg) {
 			IOFreeType(notifyMsg, mach_msg_header_t);