X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/060df5ea7c632b1ac8cc8aac1fb59758165c2084..6d2010ae8f7a6078e10b361c6962983bab233e0f:/osfmk/console/video_console.c

diff --git a/osfmk/console/video_console.c b/osfmk/console/video_console.c
index 4b088aa41..9c5460016 100644
--- a/osfmk/console/video_console.c
+++ b/osfmk/console/video_console.c
@@ -187,7 +187,7 @@ MACRO_END
 
 #define VCPUTC_LOCK_LOCK()				\
 MACRO_BEGIN						\
-	if (!hw_lock_to(&vcputc_lock, LockTimeOut*10))	\
+	if (!hw_lock_to(&vcputc_lock, hwLockTimeOut*10))\
 	{						\
 		panic("VCPUTC_LOCK_LOCK");		\
 	}						\
@@ -1274,7 +1274,7 @@ gc_update_color(int color, boolean_t fore)
 void
 vcputc(__unused int l, __unused int u, int c)
 {
-	if ( gc_enabled || debug_mode )
+	if ( gc_initialized && ( gc_enabled || debug_mode ) )
 	{
 		spl_t s;
 
@@ -2444,7 +2444,7 @@ initialize_screen(PE_Video * boot_vinfo, unsigned int op)
 
 #if defined(__x86_64__)
 		// Adjust the video buffer pointer to point to where it is in high virtual (above the hole)
-		new_vinfo.v_baseaddr |= VM_MIN_KERNEL_ADDRESS;
+		new_vinfo.v_baseaddr |= (VM_MIN_KERNEL_ADDRESS & ~LOW_4GB_MASK);
 #endif
 
 		/* Update the vinfo structure atomically with respect to the vc_progress task if running */
@@ -2632,6 +2632,10 @@ vcattach(void)
 
 		for ( index = 0 ; index < msgbufp->msg_bufx ; index++ )
 		{
+			if (msgbufp->msg_bufc[index] == '\0') {
+				continue;
+			}
+
 			vcputc( 0, 0, msgbufp->msg_bufc[index] );
 
 			if ( msgbufp->msg_bufc[index] == '\n' )