--- xnu/xnu-792.1.5/iokit/Kernel/IOKitDebug.cpp
+++ xnu/xnu-124.1/iokit/Kernel/IOKitDebug.cpp
@@ -26,8 +26,6 @@
  *
  */
 
-#include <sys/sysctl.h>
-
 #include <IOKit/IOKitDebug.h>
 #include <IOKit/IOLib.h>
 #include <IOKit/assert.h>
@@ -37,24 +35,18 @@
 #include <libkern/c++/OSContainers.h>
 #include <libkern/c++/OSCPPDebug.h>
 
+extern "C" {
+
+SInt64		gIOKitDebug
 #ifdef IOKITDEBUG
-#define DEBUG_INIT_VALUE IOKITDEBUG
-#else
-#define DEBUG_INIT_VALUE 0
+                            = IOKITDEBUG
 #endif
-
-SInt64		gIOKitDebug = DEBUG_INIT_VALUE;
-SYSCTL_QUAD(_debug, OID_AUTO, iokit, CTLFLAG_RW, &gIOKitDebug, "boot_arg io");
-
+;
 
 int 		debug_malloc_size;
 int		debug_iomalloc_size;
-vm_size_t	debug_iomallocpageable_size;
 int 		debug_container_malloc_size;
 // int 		debug_ivars_size; // in OSObject.cpp
-
-extern "C" {
-
 
 void IOPrintPlane( const IORegistryPlane * plane )
 {
@@ -75,71 +67,11 @@
 
     iter->reset();
     while( (next = iter->getNextObjectRecursive())) {
-	sprintf( format + 1, "%ds", 2 * next->getDepth( plane ));
+	sprintf( format + 1, "%ds", next->getDepth( plane ));
 	IOLog( format, "");
-	IOLog( "\033[33m%s", next->getName( plane ));
-	if( (next->getLocation( plane )))
-            IOLog("@%s", next->getLocation( plane ));
-	IOLog("\033[0m <class %s", next->getMetaClass()->getClassName());
         if( (service = OSDynamicCast(IOService, next)))
-            IOLog(", busy %ld", service->getBusyState());
-	IOLog( ">\n");
-	IOSleep(250);
-    }
-    iter->release();
-}
-
-void dbugprintf(char *fmt, ...);
-void db_dumpiojunk( const IORegistryPlane * plane );
-
-void db_piokjunk(void) {
-
-	dbugprintf("\nDT plane:\n");
-	db_dumpiojunk( gIODTPlane );
-	dbugprintf("\n\nService plane:\n");
-	db_dumpiojunk( gIOServicePlane );
-    dbugprintf("\n\n"
-	    "ivar kalloc()       0x%08x\n"
-	    "malloc()            0x%08x\n"
-            "containers kalloc() 0x%08x\n"
-	    "IOMalloc()          0x%08x\n"
-            "----------------------------------------\n",
-	    debug_ivars_size,
-            debug_malloc_size,
-            debug_container_malloc_size,
-            debug_iomalloc_size
-            );
-
-}
-
-
-void db_dumpiojunk( const IORegistryPlane * plane )
-{
-    IORegistryEntry *		next;
-    IORegistryIterator * 	iter;
-    OSOrderedSet *		all;
-    char			format[] = "%xxxs";
-    IOService *			service;
-
-    iter = IORegistryIterator::iterateOver( plane );
-
-    all = iter->iterateAll();
-    if( all) {
-        dbugprintf("Count %d\n", all->getCount() );
-        all->release();
-    } else dbugprintf("Empty\n");
-
-    iter->reset();
-    while( (next = iter->getNextObjectRecursive())) {
-		sprintf( format + 1, "%ds", 2 * next->getDepth( plane ));
-		dbugprintf( format, "");
-		dbugprintf( "%s", next->getName( plane ));
-		if( (next->getLocation( plane )))
-				dbugprintf("@%s", next->getLocation( plane ));
-		dbugprintf(" <class %s", next->getMetaClass()->getClassName());
-			if( (service = OSDynamicCast(IOService, next)))
-				dbugprintf(", busy %ld", service->getBusyState());
-		dbugprintf( ">\n");
+            IOLog("<%ld>", service->getBusyState());
+	IOLog( "%s\n", next->getName());
     }
     iter->release();
 }
@@ -210,9 +142,8 @@
     updateOffset( dict, debug_ivars_size, "Instance allocation" );
     updateOffset( dict, debug_container_malloc_size, "Container allocation" );
     updateOffset( dict, debug_iomalloc_size, "IOMalloc allocation" );
-    updateOffset( dict, debug_iomallocpageable_size, "Pageable allocation" );
 
-    OSMetaClass::serializeClassDictionary(dict);
+    dict->setObject( "Classes", OSMetaClass::getClassDictionary() );
 
     ok = dict->serialize( s );