xnu-3247.1.106.tar.gz

[apple/xnu.git] / osfmk / vm / vm_init.c

diff --git a/osfmk/vm/vm_init.c b/osfmk/vm/vm_init.c
index 027e6c4161dc14dc75ce31667a0c907af4986b87..b5796e35ee31600e37afebe304d54b1229c8d7df 100644 (file)
--- a/osfmk/vm/vm_init.c
+++ b/osfmk/vm/vm_init.c
@@ -68,6 +68,7 @@
 #include <kern/zalloc.h>
 #include <kern/kalloc.h>
 #include <kern/kext_alloc.h>
+#include <sys/kdebug.h>
 #include <vm/vm_object.h>
 #include <vm/vm_map.h>
 #include <vm/vm_page.h>
@@ -96,6 +97,13 @@ boolean_t zlog_ready = FALSE;
 vm_offset_t kmapoff_kaddr;
 unsigned int kmapoff_pgcnt;
 
+static inline void
+vm_mem_bootstrap_log(const char *message)
+{
+//     kprintf("vm_mem_bootstrap: %s\n", message);
+       kernel_debug_string_simple(message);
+}
+
 /*
  *     vm_mem_bootstrap initializes the virtual memory system.
  *     This is done only by the first cpu up.
@@ -113,27 +121,25 @@ vm_mem_bootstrap(void)
         *      From here on, all physical memory is accounted for,
         *      and we use only virtual addresses.
         */
-#define vm_mem_bootstrap_kprintf(x) /* kprintf(x) */
-
-       vm_mem_bootstrap_kprintf(("vm_mem_bootstrap: calling vm_page_bootstrap\n"));
+       vm_mem_bootstrap_log("vm_page_bootstrap");
        vm_page_bootstrap(&start, &end);
 
        /*
         *      Initialize other VM packages
         */
 
-       vm_mem_bootstrap_kprintf(("vm_mem_bootstrap: calling zone_bootstrap\n"));
+       vm_mem_bootstrap_log("zone_bootstrap");
        zone_bootstrap();
 
-       vm_mem_bootstrap_kprintf(("vm_mem_bootstrap: calling vm_object_bootstrap\n"));
+       vm_mem_bootstrap_log("vm_object_bootstrap");
        vm_object_bootstrap();
 
        vm_kernel_ready = TRUE;
 
-       vm_mem_bootstrap_kprintf(("vm_mem_bootstrap: calling vm_map_init\n"));
+       vm_mem_bootstrap_log("vm_map_init");
        vm_map_init();
 
-       vm_mem_bootstrap_kprintf(("vm_mem_bootstrap: calling kmem_init\n"));
+       vm_mem_bootstrap_log("kmem_init");
        kmem_init(start, end);
        kmem_ready = TRUE;
        /*
@@ -147,10 +153,10 @@ vm_mem_bootstrap(void)
 
        if (kmapoff_pgcnt > 0 &&
            vm_allocate(kernel_map, &kmapoff_kaddr,
-           kmapoff_pgcnt * PAGE_SIZE_64, VM_FLAGS_ANYWHERE) != KERN_SUCCESS)
+           kmapoff_pgcnt * PAGE_SIZE_64, VM_FLAGS_ANYWHERE | VM_MAKE_TAG(VM_KERN_MEMORY_OSFMK)) != KERN_SUCCESS)
                panic("cannot vm_allocate %u kernel_map pages", kmapoff_pgcnt);
 
-       vm_mem_bootstrap_kprintf(("vm_mem_bootstrap: calling pmap_init\n"));
+       vm_mem_bootstrap_log("pmap_init");
        pmap_init();
        
        kmem_alloc_ready = TRUE;
@@ -173,10 +179,10 @@ vm_mem_bootstrap(void)
                zsize = ZONE_MAP_MAX;   /* Clamp to 1.5GB max for K32 */
 #endif /* !__LP64__ */
 
-       vm_mem_bootstrap_kprintf(("vm_mem_bootstrap: calling kext_alloc_init\n"));
+       vm_mem_bootstrap_log("kext_alloc_init");
        kext_alloc_init();
 
-       vm_mem_bootstrap_kprintf(("vm_mem_bootstrap: calling zone_init\n"));
+       vm_mem_bootstrap_log("zone_init");
        assert((vm_size_t) zsize == zsize);
        zone_init((vm_size_t) zsize);   /* Allocate address space for zones */
 
@@ -186,27 +192,27 @@ vm_mem_bootstrap(void)
         * page allocations (which are used for guard pages by the guard
         * mode zone allocator).
         */
-       vm_mem_bootstrap_kprintf(("vm_mem_bootstrap: calling vm_page_module_init\n"));
+       vm_mem_bootstrap_log("vm_page_module_init");
        vm_page_module_init();
 
-       vm_mem_bootstrap_kprintf(("vm_mem_bootstrap: calling kalloc_init\n"));
+       vm_mem_bootstrap_log("kalloc_init");
        kalloc_init();
 
-       vm_mem_bootstrap_kprintf(("vm_mem_bootstrap: calling vm_fault_init\n"));
+       vm_mem_bootstrap_log("vm_fault_init");
        vm_fault_init();
 
-       vm_mem_bootstrap_kprintf(("vm_mem_bootstrap: calling memory_manager_default_init\n"));
+       vm_mem_bootstrap_log("memory_manager_default_init");
        memory_manager_default_init();
 
-       vm_mem_bootstrap_kprintf(("vm_mem_bootstrap: calling memory_object_control_bootstrap\n"));
+       vm_mem_bootstrap_log("memory_object_control_bootstrap");
        memory_object_control_bootstrap();
 
-       vm_mem_bootstrap_kprintf(("vm_mem_bootstrap: calling device_pager_bootstrap\n"));
+       vm_mem_bootstrap_log("device_pager_bootstrap");
        device_pager_bootstrap();
 
        vm_paging_map_init();
 
-       vm_mem_bootstrap_kprintf(("vm_mem_bootstrap: done\n"));
+       vm_mem_bootstrap_log("vm_mem_bootstrap done");
 }
 
 void