xnu-344.21.73.tar.gz

[apple/xnu.git] / bsd / kern / bsd_init.c

diff --git a/bsd/kern/bsd_init.c b/bsd/kern/bsd_init.c
index 1b81ced7b7517c0bb4843960f3c45bbb2d85886c..cd7fbbc456dbbf9b1952471a3e060b2672122139 100644 (file)
--- a/bsd/kern/bsd_init.c
+++ b/bsd/kern/bsd_init.c
@@ -3,19 +3,22 @@
  *
  * @APPLE_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.
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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. 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@
  */
@@ -117,7 +120,6 @@
 #include <mach/shared_memory_server.h>
 #include <vm/vm_shared_memory_server.h>
 
-extern shared_region_mapping_t       system_shared_region;
 extern int app_profile;                /* on/off switch for pre-heat cache */
 
 char    copyright[] =
@@ -412,6 +414,7 @@ bsd_init()
         */
        s = splimp();
        sysctl_register_fixed(); 
+       sysctl_mib_init();
        dlil_init();
        socketinit();
        domaininit();
@@ -527,6 +530,7 @@ bsdinit_task(void)
        struct uthread *ut;
        kern_return_t   kr;
        thread_act_t th_act;
+       shared_region_mapping_t system_region;
 
        proc_name("init", p);
 
@@ -556,8 +560,14 @@ bsdinit_task(void)
        bsd_hardclockinit = 1;  /* Start bsd hardclock */
        bsd_init_task = get_threadtask(th_act);
        init_task_failure_data[0] = 0;
-       shared_region_mapping_ref(system_shared_region);
-       vm_set_shared_region(get_threadtask(th_act), system_shared_region);
+       system_region = lookup_default_shared_region(
+                       ENV_DEFAULT_ROOT, ENV_DEFAULT_SYSTEM);
+        if (system_region == NULL) {
+               shared_file_boot_time_init(
+                       ENV_DEFAULT_ROOT, ENV_DEFAULT_SYSTEM);
+       } else {
+               vm_set_shared_region(get_threadtask(th_act), system_region);
+       }
        load_init_program(p);
        /* turn on app-profiling i.e. pre-heating */
        app_profile = 1;