1 files changed, 6 insertions, 1 deletions

diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c
index da55ccaf4d55..182dd6f8aadd 100644
--- a/drivers/video/console/vgacon.c
+++ b/drivers/video/console/vgacon.c
@@ -112,7 +112,7 @@ static int 		vga_video_font_height;
 static int              vga_scan_lines          __read_mostly;
 static unsigned int     vga_rolled_over;
 
-int vgacon_text_mode_force = 0;
+static int vgacon_text_mode_force;
 
 bool vgacon_text_force(void)
 {
@@ -585,6 +585,11 @@ static void vgacon_init(struct vc_data *c, int init)
         vgacon_uni_pagedir[1]++;
         if (!vgacon_uni_pagedir[0] && p)
                 con_set_default_unimap(c);
+
+        /* Only set the default if the user didn't deliberately override it */
+        if (global_cursor_default == -1)
+                global_cursor_default =
+                        !(screen_info.flags & VIDEO_FLAGS_NOCURSOR);
 }
 
 static void vgacon_deinit(struct vc_data *c)