--- xnu/xnu-517.7.21/iokit/Kernel/IOWorkLoop.cpp
+++ xnu/xnu-792.6.61/iokit/Kernel/IOWorkLoop.cpp
@@ -57,12 +57,6 @@
 
 #define fFlags loopRestart
 
-void IOWorkLoop::launchThreadMain(void *self)
-{
-    thread_set_cont_arg((int) self);
-    threadMainContinuation();
-}
-
 bool IOWorkLoop::init()
 {
     // The super init and gateLock allocation MUST be done first
@@ -90,7 +84,7 @@
     if (addEventSource(controlG) != kIOReturnSuccess)
         return false;
 
-    workThread = IOCreateThread(launchThreadMain, (void *) this);
+    workThread = IOCreateThread((thread_continue_t)threadMainContinuation, this);
     if (!workThread)
         return false;
 
@@ -246,12 +240,9 @@
 
 #endif /* KDEBUG */
 
-void IOWorkLoop::threadMainContinuation()
-{
-  IOWorkLoop* self;
-  self = (IOWorkLoop *) thread_get_cont_arg();
-
-  self->threadMain();
+void IOWorkLoop::threadMainContinuation(IOWorkLoop *self)
+{
+	self->threadMain();
 }
 
 void IOWorkLoop::threadMain()
@@ -294,8 +285,7 @@
 	    assert_wait((void *) &workToDo, false);
 	    IOSimpleLockUnlockEnableInterrupt(workToDoLock, is);
 
-	    thread_set_cont_arg((int) this);
-	    thread_block(&threadMainContinuation);
+	    thread_block_parameter((thread_continue_t)threadMainContinuation, this);
 	    /* NOTREACHED */
 	}