Loading...
--- xnu/xnu-792.2.4/iokit/Kernel/IOWorkLoop.cpp
+++ xnu/xnu-344.2/iokit/Kernel/IOWorkLoop.cpp
@@ -57,6 +57,18 @@
#define fFlags loopRestart
+extern "C" extern void stack_privilege( thread_t thread);
+
+void IOWorkLoop::launchThreadMain(void *self)
+{
+ register thread_t mythread = current_thread();
+
+ // Make sure that this thread always has a kernel stack
+ stack_privilege(mythread);
+ thread_set_cont_arg((int) self);
+ threadMainContinuation();
+}
+
bool IOWorkLoop::init()
{
// The super init and gateLock allocation MUST be done first
@@ -84,7 +96,7 @@
if (addEventSource(controlG) != kIOReturnSuccess)
return false;
- workThread = IOCreateThread((thread_continue_t)threadMainContinuation, this);
+ workThread = IOCreateThread(launchThreadMain, (void *) this);
if (!workThread)
return false;
@@ -97,7 +109,7 @@
IOWorkLoop *me = new IOWorkLoop;
if (me && !me->init()) {
- me->release();
+ me->free();
return 0;
}
@@ -240,9 +252,12 @@
#endif /* KDEBUG */
-void IOWorkLoop::threadMainContinuation(IOWorkLoop *self)
-{
- self->threadMain();
+void IOWorkLoop::threadMainContinuation()
+{
+ IOWorkLoop* self;
+ self = (IOWorkLoop *) thread_get_cont_arg();
+
+ self->threadMain();
}
void IOWorkLoop::threadMain()
@@ -285,7 +300,8 @@
assert_wait((void *) &workToDo, false);
IOSimpleLockUnlockEnableInterrupt(workToDoLock, is);
- thread_block_parameter((thread_continue_t)threadMainContinuation, this);
+ thread_set_cont_arg((int) this);
+ thread_block(&threadMainContinuation);
/* NOTREACHED */
}
@@ -357,8 +373,8 @@
}
IOReturn IOWorkLoop::runAction(Action inAction, OSObject *target,
- void *arg0, void *arg1,
- void *arg2, void *arg3)
+ void *arg0 = 0, void *arg1 = 0,
+ void *arg2 = 0, void *arg3 = 0)
{
IOReturn res;