xnu-1228.5.18.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 88f922edaa5d69628bd225544569ca4269f62fd3..11927893c5c1474aab857429b896c4095806ad09 100644 (file)
--- a/osfmk/vm/vm_init.c
+++ b/osfmk/vm/vm_init.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -78,13 +78,16 @@
 
 #include <vm/vm_protos.h>
 
-#define ZONE_MAP_MIN (12 * 1024 * 1024) 
-/* Maximum Zone size is 1G */
-#define ZONE_MAP_MAX (1024 * 1024 * 1024) 
+#define ZONE_MAP_MIN CONFIG_ZONE_MAP_MIN
+
+/* Maximum zone size is 1.5G */
+#define ZONE_MAP_MAX (1024 * 1024 * 1536) 
 
 const vm_offset_t vm_min_kernel_address = VM_MIN_KERNEL_ADDRESS;
 const vm_offset_t vm_max_kernel_address = VM_MAX_KERNEL_ADDRESS;
 
+boolean_t vm_kernel_ready = FALSE;
+
 /*
  *     vm_mem_bootstrap initializes the virtual memory system.
  *     This is done only by the first cpu up.
@@ -102,17 +105,30 @@ 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)
 
+       vm_mem_bootstrap_kprintf(("vm_mem_bootstrap: calling vm_page_bootstrap\n"));
        vm_page_bootstrap(&start, &end);
 
        /*
         *      Initialize other VM packages
         */
 
+       vm_mem_bootstrap_kprintf(("vm_mem_bootstrap: calling zone_bootstrap\n"));
        zone_bootstrap();
+
+       vm_mem_bootstrap_kprintf(("vm_mem_bootstrap: calling vm_object_bootstrap\n"));
        vm_object_bootstrap();
+
+       vm_kernel_ready = TRUE;
+
+       vm_mem_bootstrap_kprintf(("vm_mem_bootstrap: calling vm_map_int\n"));
        vm_map_init();
+
+       vm_mem_bootstrap_kprintf(("vm_mem_bootstrap: calling kmem_init\n"));
        kmem_init(start, end);
+
+       vm_mem_bootstrap_kprintf(("vm_mem_bootstrap: calling pmap_init\n"));
        pmap_init();
        
        if (PE_parse_boot_arg("zsize", &zsizearg))
@@ -123,14 +139,31 @@ vm_mem_bootstrap(void)
 
        if(zsize < ZONE_MAP_MIN) zsize = ZONE_MAP_MIN;  /* Clamp to min */
        if(zsize > ZONE_MAP_MAX) zsize = ZONE_MAP_MAX;  /* Clamp to max */
+
+       vm_mem_bootstrap_kprintf(("vm_mem_bootstrap: calling zone_init\n"));
        zone_init(zsize);                                               /* Allocate address space for zones */
        
+       vm_mem_bootstrap_kprintf(("vm_mem_bootstrap: calling kalloc_init\n"));
        kalloc_init();
+
+       vm_mem_bootstrap_kprintf(("vm_mem_bootstrap: calling vm_fault_init\n"));
        vm_fault_init();
+
+       vm_mem_bootstrap_kprintf(("vm_mem_bootstrap: calling vm_page_module_init\n"));
        vm_page_module_init();
+
+       vm_mem_bootstrap_kprintf(("vm_mem_bootstrap: calling memory_manager_default_init\n"));
        memory_manager_default_init();
+
+       vm_mem_bootstrap_kprintf(("vm_mem_bootstrap: calling meory_object_control_bootstrap\n"));
        memory_object_control_bootstrap();
+
+       vm_mem_bootstrap_kprintf(("vm_mem_bootstrap: calling device_pager_bootstrap\n"));
        device_pager_bootstrap();
+
+       vm_paging_map_init();
+
+       vm_mem_bootstrap_kprintf(("vm_mem_bootstrap: done\n"));
 }
 
 void