xnu-2782.1.97.tar.gz

[apple/xnu.git] / osfmk / ipc / ipc_init.c

diff --git a/osfmk/ipc/ipc_init.c b/osfmk/ipc/ipc_init.c
index 879748a89e5926307bb3edd1a776543e9ddbb327..2211d1b18f19cc0ebb1b3676e3ca4be03f86cd5b 100644 (file)
--- a/osfmk/ipc/ipc_init.c
+++ b/osfmk/ipc/ipc_init.c
@@ -79,6 +79,7 @@
 
 #include <kern/kern_types.h>
 #include <kern/kalloc.h>
 
 #include <kern/kern_types.h>
 #include <kern/kalloc.h>

+#include <kern/simple_lock.h>

 #include <kern/mach_param.h>
 #include <kern/ipc_host.h>
 #include <kern/ipc_mig.h>
 #include <kern/mach_param.h>
 #include <kern/ipc_host.h>
 #include <kern/ipc_mig.h>


@@ -100,9 +101,10 @@
 #include <ipc/ipc_hash.h>
 #include <ipc/ipc_init.h>
 #include <ipc/ipc_table.h>
 #include <ipc/ipc_hash.h>
 #include <ipc/ipc_init.h>
 #include <ipc/ipc_table.h>

+#include <ipc/ipc_voucher.h>
+#include <ipc/ipc_importance.h>

 
 #include <mach/machine/ndr_def.h>   /* NDR_record */
 
 #include <mach/machine/ndr_def.h>   /* NDR_record */

-#include <ipc/ipc_labelh.h>

 
 vm_map_t ipc_kernel_map;
 vm_size_t ipc_kernel_map_size = 1024 * 1024;
 
 vm_map_t ipc_kernel_map;
 vm_size_t ipc_kernel_map_size = 1024 * 1024;


@@ -190,17 +192,6 @@ ipc_bootstrap(void)
                              "ipc kmsgs");
        zone_change(ipc_kmsg_zone, Z_CALLERACCT, FALSE);
 
                              "ipc kmsgs");
        zone_change(ipc_kmsg_zone, Z_CALLERACCT, FALSE);
 

-#if CONFIG_MACF_MACH
-       ipc_labelh_zone = 
-               zinit(sizeof(struct ipc_labelh),
-                     ipc_port_max * sizeof(struct ipc_labelh),
-                     sizeof(struct ipc_labelh),
-                     "label handles");
-       /* cant charge callers for label allocations (port refs passed) */
-       zone_change(ipc_labelh_zone, Z_CALLERACCT, FALSE);
-
-#endif
-

        /* create special spaces */
 
        kr = ipc_space_create_special(&ipc_space_kernel);
        /* create special spaces */
 
        kr = ipc_space_create_special(&ipc_space_kernel);


@@ -217,6 +208,11 @@ ipc_bootstrap(void)
 #endif
        mig_init();
        ipc_table_init();
 #endif
        mig_init();
        ipc_table_init();

+       ipc_voucher_init();
+
+#if IMPORTANCE_INHERITANCE
+       ipc_importance_init();
+#endif

 
        semaphore_init();
        mk_timer_init();
 
        semaphore_init();
        mk_timer_init();


@@ -270,4 +266,20 @@ ipc_init(void)
        }
 
        ipc_host_init();
        }
 
        ipc_host_init();

+
+}
+
+
+/*
+ *     Routine:        ipc_thread_call_init
+ *     Purpose:
+ *             Initialize IPC logic that needs thread call support
+ */
+
+void
+ipc_thread_call_init(void)
+{
+#if IMPORTANCE_INHERITANCE
+       ipc_importance_thread_call_init();
+#endif

 }
 }