--- xnu/xnu-3248.50.21/iokit/Kernel/IOLocks.cpp
+++ xnu/xnu-4570.41.2/iokit/Kernel/IOLocks.cpp
@@ -80,6 +80,7 @@
 	thread_wakeup_prim((event_t) event, oneThread, THREAD_AWAKENED);
 }   
 
+
 #if defined(__x86_64__)
 /*
  * For backwards compatibility, kexts built against pre-Darwin 14 headers will bind at runtime to this function,
@@ -118,7 +119,7 @@
 
 
 struct _IORecursiveLock {
-	lck_mtx_t	*mutex;
+	lck_mtx_t	mutex;
 	lck_grp_t	*group;
 	thread_t	thread;
 	UInt32		count;
@@ -135,15 +136,10 @@
     if( !lock )
         return( 0 );
 
-    lock->mutex = lck_mtx_alloc_init( lockGroup, LCK_ATTR_NULL );
-    if( lock->mutex ) {
-		lock->group = lockGroup;
-        lock->thread = 0;
-        lock->count  = 0;
-    } else {
-        IODelete( lock, _IORecursiveLock, 1 );
-        lock = 0;
-    }
+    lck_mtx_init( &lock->mutex, lockGroup, LCK_ATTR_NULL );
+    lock->group = lockGroup;
+    lock->thread = 0;
+    lock->count  = 0;
 
     return( (IORecursiveLock *) lock );
 }
@@ -158,13 +154,13 @@
 {
     _IORecursiveLock * lock = (_IORecursiveLock *)_lock;
 	
-    lck_mtx_free( lock->mutex, lock->group );
+    lck_mtx_destroy(&lock->mutex, lock->group);
     IODelete( lock, _IORecursiveLock, 1 );
 }
 
 lck_mtx_t * IORecursiveLockGetMachLock( IORecursiveLock * lock )
 {
-    return( lock->mutex );
+    return( &lock->mutex );
 }
 
 void IORecursiveLockLock( IORecursiveLock * _lock)
@@ -174,7 +170,7 @@
     if( lock->thread == IOThreadSelf())
         lock->count++;
     else {
-        lck_mtx_lock( lock->mutex );
+        lck_mtx_lock( &lock->mutex );
         assert( lock->thread == 0 );
         assert( lock->count == 0 );
         lock->thread = IOThreadSelf();
@@ -190,7 +186,7 @@
         lock->count++;
 	return( true );
     } else {
-        if( lck_mtx_try_lock( lock->mutex )) {
+        if( lck_mtx_try_lock( &lock->mutex )) {
             assert( lock->thread == 0 );
             assert( lock->count == 0 );
             lock->thread = IOThreadSelf();
@@ -209,7 +205,7 @@
 
     if( 0 == (--lock->count)) {
         lock->thread = 0;
-        lck_mtx_unlock( lock->mutex );
+        lck_mtx_unlock( &lock->mutex );
     }
 }
 
@@ -230,7 +226,7 @@
     
     lock->count = 0;
     lock->thread = 0;
-    res = lck_mtx_sleep(lock->mutex, LCK_SLEEP_PROMOTED_PRI, (event_t) event, (wait_interrupt_t) interType);
+    res = lck_mtx_sleep(&lock->mutex, LCK_SLEEP_PROMOTED_PRI, (event_t) event, (wait_interrupt_t) interType);
 
     // Must re-establish the recursive lock no matter why we woke up
     // otherwise we would potentially leave the return path corrupted.
@@ -252,7 +248,7 @@
     
     lock->count = 0;
     lock->thread = 0;
-    res = lck_mtx_sleep_deadline(lock->mutex, LCK_SLEEP_PROMOTED_PRI, (event_t) event, 
+    res = lck_mtx_sleep_deadline(&lock->mutex, LCK_SLEEP_PROMOTED_PRI, (event_t) event,
 								      (wait_interrupt_t) interType, __OSAbsoluteTime(deadline));
 
     // Must re-establish the recursive lock no matter why we woke up
@@ -313,6 +309,30 @@
     return( (lck_spin_t *)lock);
 }
 
+#ifndef IOLOCKS_INLINE
+/*
+ * Lock assertions
+ */
+
+void
+IOLockAssert(IOLock * lock, IOLockAssertState type)
+{
+    LCK_MTX_ASSERT(lock, type);
+}
+
+void
+IORWLockAssert(IORWLock * lock, IORWLockAssertState type)
+{
+    LCK_RW_ASSERT(lock, type);
+}
+
+void
+IOSimpleLockAssert(IOSimpleLock *lock, IOSimpleLockAssertState type)
+{
+    LCK_SPIN_ASSERT(l, type);
+}
+#endif /* !IOLOCKS_INLINE */
+
 } /* extern "C" */