xnu-517.7.21.tar.gz

[apple/xnu.git] / iokit / Kernel / IOLocks.cpp

diff --git a/iokit/Kernel/IOLocks.cpp b/iokit/Kernel/IOLocks.cpp
index 2379b069e764da8b623b704e843803b324496f2b..43884bfb3f69f094ac400a68303315c14b5cb177 100644 (file)
--- a/iokit/Kernel/IOLocks.cpp
+++ b/iokit/Kernel/IOLocks.cpp
@@ -149,21 +149,16 @@ int IORecursiveLockSleep(IORecursiveLock *_lock, void *event, UInt32 interType)
     assert(lock->thread == IOThreadSelf());
     assert(lock->count == 1 || interType == THREAD_UNINT);
     
-    assert_wait((event_t) event, (int) interType);
     lock->count = 0;
     lock->thread = 0;
-    mutex_unlock(lock->mutex);
-    
-    res = thread_block(0);
+    res = thread_sleep_mutex((event_t) event, lock->mutex, (int) interType);
 
     // Must re-establish the recursive lock no matter why we woke up
     // otherwise we would potentially leave the return path corrupted.
-    mutex_lock(lock->mutex);
     assert(lock->thread == 0);
     assert(lock->count == 0);
     lock->thread = IOThreadSelf();
     lock->count = count;
-
     return res;
 }