xnu-792.12.6.tar.gz

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

diff --git a/osfmk/kern/locks.h b/osfmk/kern/locks.h
index feca9487d80bd294e6e7a637dbd314a1d78482fe..cd4e9a178cd0974fd40097374b47b9af8b67d801 100644 (file)
--- a/osfmk/kern/locks.h
+++ b/osfmk/kern/locks.h
@@ -1,23 +1,31 @@
 /*
  * Copyright (c) 2003-2005 Apple Computer, Inc. All rights reserved.
  *
 /*
  * Copyright (c) 2003-2005 Apple Computer, Inc. All rights reserved.
  *

- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_LICENSE_OSREFERENCE_HEADER_START@
+ * 
+ * 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.

  *
  *

- * 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.
+ * Please obtain a copy of the License at 
+ * http://www.opensource.apple.com/apsl/ and read it before using this 
+ * file.

  *
  *

- * This 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.
+ * 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, 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_LICENSE_OSREFERENCE_HEADER_END@

  */
 
 #ifndef _KERN_LOCKS_H_
  */
 
 #ifndef _KERN_LOCKS_H_


@@ -181,10 +189,8 @@ typedef    struct _lck_attr_ {
 
 extern lck_attr_t      LockDefaultLckAttr;
 
 
 extern lck_attr_t      LockDefaultLckAttr;
 

-#define LCK_ATTR_NONE          0
-
-#define        LCK_ATTR_DEBUG                          0x00000001
-#define        LCK_ATTR_RW_SHARED_PRIORITY     0x00010000
+#define        LCK_ATTR_NONE           0
+#define        LCK_ATTR_DEBUG  0x1

 
 #else
 typedef struct __lck_attr__ lck_attr_t;
 
 #else
 typedef struct __lck_attr__ lck_attr_t;


@@ -203,11 +209,6 @@ extern     void                    lck_attr_setdefault(
 extern void                    lck_attr_setdebug(
                                                                        lck_attr_t              *attr);
 
 extern void                    lck_attr_setdebug(
                                                                        lck_attr_t              *attr);
 

-#ifdef XNU_KERNEL_PRIVATE
-extern void                    lck_attr_rw_shared_priority(
-                                                                       lck_attr_t              *attr);
-#endif
-

 extern void                    lck_attr_free(
                                                                        lck_attr_t              *attr);
 
 extern void                    lck_attr_free(
                                                                        lck_attr_t              *attr);