1 files changed, 9 insertions, 3 deletions

diff --git a/drivers/char/vt.c b/drivers/char/vt.c
index d8f83e26e4a4..008176edbd64 100644
--- a/drivers/char/vt.c
+++ b/drivers/char/vt.c
@@ -1644,7 +1644,10 @@ static void reset_terminal(struct vc_data *vc, int do_clear)
         vc->vc_tab_stop[1]      =
         vc->vc_tab_stop[2]      =
         vc->vc_tab_stop[3]      =
-        vc->vc_tab_stop[4]      = 0x01010101;
+        vc->vc_tab_stop[4]      =
+        vc->vc_tab_stop[5]      =
+        vc->vc_tab_stop[6]      =
+        vc->vc_tab_stop[7]      = 0x01010101;
 
         vc->vc_bell_pitch = DEFAULT_BELL_PITCH;
         vc->vc_bell_duration = DEFAULT_BELL_DURATION;
@@ -1935,7 +1938,10 @@ static void do_con_trol(struct tty_struct *tty, struct vc_data *vc, int c)
                                         vc->vc_tab_stop[1] =
                                         vc->vc_tab_stop[2] =
                                         vc->vc_tab_stop[3] =
-                                        vc->vc_tab_stop[4] = 0;
+                                        vc->vc_tab_stop[4] =
+                                        vc->vc_tab_stop[5] =
+                                        vc->vc_tab_stop[6] =
+                                        vc->vc_tab_stop[7] = 0;
                         }
                         return;
                 case 'm':
@@ -2268,7 +2274,7 @@ rescan_last_byte:
                                     continue; /* nothing to display */
                                 }
                                 /* Glyph not found */
-                                if ((!(vc->vc_utf && !vc->vc_disp_ctrl) || c < 128) && !(c & ~charmask)) {
+                                if ((!(vc->vc_utf && !vc->vc_disp_ctrl) && c < 128) && !(c & ~charmask)) {
                                     /* In legacy mode use the glyph we get by a 1:1 mapping.
                                        This would make absolutely no sense with Unicode in mind,
                                        but do this for ASCII characters since a font may lack