xnu-4903.241.1.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 d81098ce99fe28a456af3681823ba5ed9ecc29c6..d8e0917e756c69903bee2a8fe9944f640a36fe34 100644 (file)
--- a/osfmk/ipc/ipc_init.c
+++ b/osfmk/ipc/ipc_init.c
@@ -71,7 +71,6 @@
  */
 
 #include <mach_debug.h>
-#include <mach_rt.h>
 
 #include <mach/port.h>
 #include <mach/message.h>
@@ -88,6 +87,7 @@
 #include <kern/misc_protos.h>
 #include <kern/sync_lock.h>
 #include <kern/sync_sema.h>
+#include <kern/ux_handler.h>
 #include <vm/vm_map.h>
 #include <vm/vm_kern.h>
 
@@ -132,8 +132,6 @@ lck_attr_t          ipc_lck_attr;
 
 static lck_grp_attr_t  ipc_lck_grp_attr;
 
-extern void ikm_cache_init(void);
-
 /*
  *     Routine:        ipc_bootstrap
  *     Purpose:
@@ -191,6 +189,7 @@ ipc_bootstrap(void)
                              IKM_SAVED_KMSG_SIZE,
                              "ipc kmsgs");
        zone_change(ipc_kmsg_zone, Z_CALLERACCT, FALSE);
+       zone_change(ipc_kmsg_zone, Z_CACHING_ENABLED, TRUE);
 
        /* create special spaces */
 
@@ -238,13 +237,21 @@ ipc_init(void)
        vm_offset_t min;
 
        retval = kmem_suballoc(kernel_map, &min, ipc_kernel_map_size,
-                              TRUE, VM_FLAGS_ANYWHERE | VM_MAKE_TAG(VM_KERN_MEMORY_IPC), &ipc_kernel_map);
+                              TRUE,
+                              (VM_FLAGS_ANYWHERE),
+                              VM_MAP_KERNEL_FLAGS_NONE,
+                              VM_KERN_MEMORY_IPC,
+                              &ipc_kernel_map);
 
        if (retval != KERN_SUCCESS)
                panic("ipc_init: kmem_suballoc of ipc_kernel_map failed");
 
        retval = kmem_suballoc(kernel_map, &min, ipc_kernel_copy_map_size,
-                              TRUE, VM_FLAGS_ANYWHERE | VM_MAKE_TAG(VM_KERN_MEMORY_IPC), &ipc_kernel_copy_map);
+                              TRUE,
+                              (VM_FLAGS_ANYWHERE),
+                              VM_MAP_KERNEL_FLAGS_NONE,
+                              VM_KERN_MEMORY_IPC,
+                              &ipc_kernel_copy_map);
 
        if (retval != KERN_SUCCESS)
                panic("ipc_init: kmem_suballoc of ipc_kernel_copy_map failed");
@@ -268,6 +275,7 @@ ipc_init(void)
        msg_ool_size_small -= cpy_kdata_hdr_sz;
 
        ipc_host_init();
+       ux_handler_init();
 
 }
 
@@ -285,3 +293,4 @@ ipc_thread_call_init(void)
        ipc_importance_thread_call_init();
 #endif
 }
+