xnu-1228.12.14.tar.gz

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

diff --git a/osfmk/kern/lock.h b/osfmk/kern/lock.h
index 4cb10d3259292383f11661a1a21368586ea426e9..eb5ed024e11152be18f474083b1ef817ef3f941d 100644 (file)
--- a/osfmk/kern/lock.h
+++ b/osfmk/kern/lock.h
@@ -1,23 +1,29 @@
 /*
  * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @OSF_COPYRIGHT@
@@ -79,6 +85,21 @@ extern void                  mutex_init(
                                                mutex_t         *mutex,
                                                unsigned short  tag);
 
+#ifdef i386
+extern void                    mutex_try_spin(
+                                               mutex_t         *mutex);
+
+extern void                    mutex_lock_spin(
+                                               mutex_t         *mutex);
+
+extern void                    mutex_convert_spin(
+                                               mutex_t         *mutex);
+#else
+#define        mutex_try_spin(l)       mutex_try(l)
+#define        mutex_lock_spin(l)      mutex_lock(l)
+#define        mutex_convert_spin(l)   do {} while (0)
+#endif
+
 #endif /* MACH_KERNEL_PRIVATE */
 
 extern mutex_t         *mutex_alloc(
@@ -96,7 +117,8 @@ extern void                  mutex_unlock(
 extern boolean_t       mutex_try(
                                                mutex_t         *mutex);
 
-extern void                    mutex_pause(void);
+extern void                    mutex_pause(uint32_t);
+extern void                    mutex_yield(mutex_t *);
 
 #define MA_OWNED        0x01
 #define MA_NOTOWNED     0x02