xnu-7195.101.1.tar.gz

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

diff --git a/osfmk/kern/startup.c b/osfmk/kern/startup.c
index 5f19428395bf96f3c4402f98def07bf4784b4d8d..12cbd907b6b1959f2ed6bd7656cb168cd836b645 100644 (file)
--- a/osfmk/kern/startup.c
+++ b/osfmk/kern/startup.c
@@ -197,7 +197,6 @@ void scale_setup(void);
 extern void bsd_scale_setup(int);
 extern unsigned int semaphore_max;
 extern void stackshot_init(void);
 extern void bsd_scale_setup(int);
 extern unsigned int semaphore_max;
 extern void stackshot_init(void);

-extern void ktrace_init(void);

 
 /*
  *     Running in virtual memory, on the interrupt stack.
 
 /*
  *     Running in virtual memory, on the interrupt stack.


@@ -324,6 +323,7 @@ kernel_startup_log(startup_subsystem_id_t subsystem)
                [STARTUP_SUB_CODESIGNING] = "codesigning",
                [STARTUP_SUB_OSLOG] = "oslog",
                [STARTUP_SUB_MACH_IPC] = "mach_ipc",
                [STARTUP_SUB_CODESIGNING] = "codesigning",
                [STARTUP_SUB_OSLOG] = "oslog",
                [STARTUP_SUB_MACH_IPC] = "mach_ipc",

+               [STARTUP_SUB_SYSCTL] = "sysctl",

                [STARTUP_SUB_EARLY_BOOT] = "early_boot",
 
                /* LOCKDOWN is special and its value won't fit here. */
                [STARTUP_SUB_EARLY_BOOT] = "early_boot",
 
                /* LOCKDOWN is special and its value won't fit here. */


@@ -642,13 +642,6 @@ kernel_bootstrap_thread(void)
        bootprofile_init();
 #endif
 
        bootprofile_init();
 #endif
 

-#if (defined(__i386__) || defined(__x86_64__)) && CONFIG_VMX
-       vmx_init();
-#endif
-
-       kernel_bootstrap_thread_log("ktrace_init");
-       ktrace_init();
-

        char trace_typefilter[256] = {};
        PE_parse_boot_arg_str("trace_typefilter", trace_typefilter,
            sizeof(trace_typefilter));
        char trace_typefilter[256] = {};
        PE_parse_boot_arg_str("trace_typefilter", trace_typefilter,
            sizeof(trace_typefilter));


@@ -658,10 +651,7 @@ kernel_bootstrap_thread(void)
        kdebug_init(new_nkdbufs, trace_typefilter,
            (trace_wrap ? KDOPT_WRAPPING : 0) | KDOPT_ATBOOT);
 
        kdebug_init(new_nkdbufs, trace_typefilter,
            (trace_wrap ? KDOPT_WRAPPING : 0) | KDOPT_ATBOOT);
 

-#ifdef  MACH_BSD
-       kernel_bootstrap_log("bsd_early_init");
-       bsd_early_init();
-#endif
+       kernel_startup_initialize_upto(STARTUP_SUB_SYSCTL);

 
 #ifdef  IOKIT
        kernel_bootstrap_log("PE_init_iokit");
 
 #ifdef  IOKIT
        kernel_bootstrap_log("PE_init_iokit");