X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/3e170ce000f1506b7b5d2c5c7faec85ceabb573d..d190cdc3f5544636abb56dc1874be391d3e1b148:/osfmk/i386/i386_init.c

diff --git a/osfmk/i386/i386_init.c b/osfmk/i386/i386_init.c
index 844b54750..d4d22ae57 100644
--- a/osfmk/i386/i386_init.c
+++ b/osfmk/i386/i386_init.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2012 Apple Inc. All rights reserved.
+ * Copyright (c) 2003-2016 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -320,6 +320,7 @@ Idle_PTs_init(void)
  * Non-bootstrap processors are called with argument boot_args_start NULL.
  * These processors switch immediately to the existing kernel page tables.
  */
+__attribute__((noreturn))
 void
 vstart(vm_offset_t boot_args_start)
 {
@@ -415,7 +416,6 @@ i386_init(void)
 	unsigned int	cpus = 0;
 	boolean_t	fidn;
 	boolean_t	IA32e = TRUE;
-	char		namep[16];
 
 	postcode(I386_INIT_ENTRY);
 
@@ -423,7 +423,7 @@ i386_init(void)
 	tsc_init();
 	rtclock_early_init();	/* mach_absolute_time() now functionsl */
 
-	kernel_debug_string_simple("i386_init");
+	kernel_debug_string_early("i386_init");
 	pstate_trace();
 
 #if CONFIG_MCA
@@ -440,13 +440,10 @@ i386_init(void)
 	panic_init();			/* Init this in case we need debugger */
 
 	/* setup debugging output if one has been chosen */
-	kernel_debug_string_simple("PE_init_kprintf");
+	kernel_debug_string_early("PE_init_kprintf");
 	PE_init_kprintf(FALSE);
 
-	if(PE_parse_boot_argn("-show_pointers", &namep, sizeof (namep)))
-		doprnt_hide_pointers = FALSE;
-
-	kernel_debug_string_simple("kernel_early_bootstrap");
+	kernel_debug_string_early("kernel_early_bootstrap");
 	kernel_early_bootstrap();
 
 	if (!PE_parse_boot_argn("diag", &dgWork.dgFlags, sizeof (dgWork.dgFlags)))
@@ -463,7 +460,7 @@ i386_init(void)
 	}
 
 	/* setup console output */
-	kernel_debug_string_simple("PE_init_printf");
+	kernel_debug_string_early("PE_init_printf");
 	PE_init_printf(FALSE);
 
 	kprintf("version_variant = %s\n", version_variant);
@@ -505,7 +502,7 @@ i386_init(void)
 	 * VM initialization, after this we're using page tables...
 	 * Thn maximum number of cpus must be set beforehand.
 	 */
-	kernel_debug_string_simple("i386_vm_init");
+	kernel_debug_string_early("i386_vm_init");
 	i386_vm_init(maxmemtouse, IA32e, kernelBootArgs);
 
 	/* create the console for verbose or pretty mode */
@@ -513,13 +510,13 @@ i386_init(void)
 	PE_init_platform(TRUE, kernelBootArgs);
 	PE_create_console();
 
-	kernel_debug_string_simple("power_management_init");
+	kernel_debug_string_early("power_management_init");
 	power_management_init();
 	processor_bootstrap();
 	thread_bootstrap();
 
 	pstate_trace();
-	kernel_debug_string_simple("machine_startup");
+	kernel_debug_string_early("machine_startup");
 	machine_startup();
 	pstate_trace();
 }
@@ -564,7 +561,7 @@ do_init_slave(boolean_t fast_restart)
 
 #if CONFIG_VMX
 	/* resume VT operation */
-	vmx_resume();
+	vmx_resume(FALSE);
 #endif
 
 #if CONFIG_MTRR