Loading...
--- xnu/xnu-124.7/iokit/Kernel/IOLocks.cpp
+++ xnu/xnu-201.5/iokit/Kernel/IOLocks.cpp
@@ -49,8 +49,6 @@
void IOLockInitWithState( IOLock * lock, IOLockState state)
{
- mutex_init( lock, ETAP_IO_AHA);
-
if( state == kIOLockStateLocked)
IOLockLock( lock);
}
@@ -96,7 +94,7 @@
if( lock->thread == IOThreadSelf())
lock->count++;
else {
- _mutex_lock( lock->mutex );
+ mutex_lock( lock->mutex );
assert( lock->thread == 0 );
assert( lock->count == 0 );
lock->thread = IOThreadSelf();
@@ -112,7 +110,7 @@
lock->count++;
return( true );
} else {
- if( _mutex_try( lock->mutex )) {
+ if( mutex_try( lock->mutex )) {
assert( lock->thread == 0 );
assert( lock->count == 0 );
lock->thread = IOThreadSelf();
@@ -159,7 +157,7 @@
res = thread_block(0);
if (THREAD_AWAKENED == res) {
- _mutex_lock(lock->mutex);
+ mutex_lock(lock->mutex);
assert(lock->thread == 0);
assert(lock->count == 0);
lock->thread = IOThreadSelf();