xnu-344.26.tar.gz

[apple/xnu.git] / osfmk / kern / startup.c

diff --git a/osfmk/kern/startup.c b/osfmk/kern/startup.c
index f5ca35a41f6e165116bd14b044475280c9d03f57..0972af8e1de5c1c4f2f9f405ac2334f3715b1a37 100644 (file)
--- a/osfmk/kern/startup.c
+++ b/osfmk/kern/startup.c
@@ -3,22 +3,19 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * 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.
  * 
- * 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
+ * This 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, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -86,7 +83,6 @@
 #include <kern/timer_call.h>
 #include <kern/xpr.h>
 #include <kern/zalloc.h>
-#include <vm/vm_shared_memory_server.h>
 #include <vm/vm_kern.h>
 #include <vm/vm_init.h>
 #include <vm/vm_map.h>
@@ -94,7 +90,6 @@
 #include <vm/vm_page.h>
 #include <vm/vm_pageout.h>
 #include <machine/pmap.h>
-#include <machine/commpage.h>
 #include <sys/version.h>
 
 #ifdef __ppc__
@@ -260,25 +255,20 @@ start_kernel_threads(void)
         */
        device_service_create();
 
-       shared_file_boot_time_init(ENV_DEFAULT_SYSTEM, ENV_DEFAULT_ROOT);
+       shared_file_boot_time_init();
 
 #ifdef IOKIT
        {
                PE_init_iokit();
        }
 #endif
-       
-       (void) spllo();         /* Allow interruptions */
-
-    /*
-     * Fill in the comm area (mapped into every task address space.)
-     */
-    commpage_populate();
 
        /*
         *      Start the user bootstrap.
         */
        
+       (void) spllo();         /* Allow interruptions */
+       
 #ifdef MACH_BSD
        { 
                extern void bsd_init(void);
@@ -286,10 +276,6 @@ start_kernel_threads(void)
        }
 #endif
 
-#if __ppc__
-       serial_keyboard_init();         /* Start serial keyboard if wanted */
-#endif
-
        thread_bind(current_thread(), PROCESSOR_NULL);
 
        /*