xnu-1228.3.13.tar.gz

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

diff --git a/osfmk/kern/zalloc.h b/osfmk/kern/zalloc.h
index f0390006640cd0c00222b4597c892913ffa958d4..e8a1ee29dc60b73a1f64d387541058e4d4c9e206 100644 (file)
--- a/osfmk/kern/zalloc.h
+++ b/osfmk/kern/zalloc.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@
@@ -70,6 +76,7 @@
 #include <zone_debug.h>
 #include <mach_kdb.h>
 #include <kern/lock.h>
+#include <kern/locks.h>
 #include <kern/queue.h>
 #include <kern/call_entry.h>
 
@@ -84,7 +91,11 @@
 struct zone {
        int             count;          /* Number of elements used now */
        vm_offset_t     free_elements;
-       decl_mutex_data(,lock)          /* generic lock */
+       decl_lck_mtx_data(,lock)        /* zone lock */
+       lck_mtx_ext_t   lock_ext;       /* placeholder for indirect mutex */
+       lck_attr_t      lock_attr;      /* zone lock attribute */
+       lck_grp_t       lock_grp;       /* zone lock group */
+       lck_grp_attr_t  lock_grp_attr;  /* zone lock group attribute */
        vm_size_t       cur_size;       /* current memory utilization */
        vm_size_t       max_size;       /* how large can this zone grow */
        vm_size_t       elem_size;      /* size of an element */
@@ -113,11 +124,11 @@ extern void               consider_zone_gc(void);
 extern void            zone_steal_memory(void);
 
 /* Bootstrap zone module (create zone zone) */
-extern void            zone_bootstrap(void);
+extern void            zone_bootstrap(void) __attribute__((section("__TEXT, initcode")));
 
 /* Init zone module */
 extern void            zone_init(
-                                       vm_size_t       map_size);
+                                       vm_size_t       map_size) __attribute__((section("__TEXT, initcode")));
 
 /* Stack use statistics */
 extern void            stack_fake_zone_info(