xnu-1504.7.4.tar.gz

[apple/xnu.git] / osfmk / kern / lock.h

diff --git a/osfmk/kern/lock.h b/osfmk/kern/lock.h
index c1b07bde552cf8eb7e737c2d2fc6e542a7d9b13d..8366e26a6e0896006507ebf6d33a88f2ba624403 100644 (file)
--- a/osfmk/kern/lock.h
+++ b/osfmk/kern/lock.h
@@ -74,47 +74,6 @@ __BEGIN_DECLS
 
 #ifndef        MACH_KERNEL_PRIVATE
 
-typedef struct __mutex__ mutex_t;
-
-#else  /* MACH_KERNEL_PRIVATE */
-
-#define        decl_mutex_data(class,name)     class mutex_t name;
-#define mutex_addr(m)                  (&(m))
-
-extern void                    mutex_init(
-                                               mutex_t         *mutex,
-                                               unsigned short  tag);
-
-#endif /* MACH_KERNEL_PRIVATE */
-
-extern mutex_t         *mutex_alloc(
-                                               unsigned short  tag);
-
-extern void                    mutex_free(
-                                               mutex_t         *mutex);
-
-extern void                    mutex_lock(
-                                               mutex_t         *mutex);
-
-extern void                    mutex_unlock(
-                                               mutex_t         *mutex);
-
-extern boolean_t       mutex_try(
-                                               mutex_t         *mutex);
-
-extern void                    mutex_pause(void);
-
-#define MA_OWNED        0x01
-#define MA_NOTOWNED     0x02
- 
-void                           _mutex_assert (
-                                               mutex_t         *mutex,
-                                               unsigned int    what);
-
-#define mutex_assert(a, b)     _mutex_assert(a, b)
-
-#ifndef        MACH_KERNEL_PRIVATE
-
 typedef struct __lock__ lock_t;
 
 #else  /* MACH_KERNEL_PRIVATE */
@@ -160,19 +119,6 @@ extern wait_result_t       thread_sleep_usimple_lock(
                                                        usimple_lock_t          lock,
                                                        wait_interrupt_t        interruptible);
 
-/* Sleep, unlocking and then relocking a mutex in the process */
-extern wait_result_t   thread_sleep_mutex(
-                                                       event_t                         event,
-                                                       mutex_t                         *mutex,
-                                                       wait_interrupt_t        interruptible);
-                                                                               
-/* Sleep with a deadline, unlocking and then relocking a mutex in the process */
-extern wait_result_t   thread_sleep_mutex_deadline(
-                                                       event_t                         event,
-                                                       mutex_t                         *mutex,
-                                                       uint64_t                        deadline,
-                                                       wait_interrupt_t        interruptible);
-
 /* Sleep, unlocking and then relocking a write lock in the process */
 extern wait_result_t   thread_sleep_lock_write(
                                                        event_t                         event,