summaryrefslogtreecommitdiffstats
path: root/drivers/tty
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-02-18 09:09:09 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-02-18 09:09:09 -0800
commit51d52b26e1d88ce79f1053f1b0f7f4d43a98d26d (patch)
treefe0d213a91f49fd4340728a4f5bf34f60e3fba8c /drivers/tty
parentc600558668e4ebd0fab6bf1d90baaf95bc43f9d5 (diff)
parent6d0abeca3242a88cab8232e4acd7e2bf088f3bc2 (diff)
downloadop-kernel-dev-51d52b26e1d88ce79f1053f1b0f7f4d43a98d26d.zip
op-kernel-dev-51d52b26e1d88ce79f1053f1b0f7f4d43a98d26d.tar.gz
Merge 3.14-rc3 into tty-next
This is for the fixes in that release, we want them here too. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/vt/vt.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c
index 61b1137..23b5d32 100644
--- a/drivers/tty/vt/vt.c
+++ b/drivers/tty/vt/vt.c
@@ -1164,6 +1164,8 @@ static void csi_J(struct vc_data *vc, int vpar)
scr_memsetw(vc->vc_screenbuf, vc->vc_video_erase_char,
vc->vc_screenbuf_size >> 1);
set_origin(vc);
+ if (CON_IS_VISIBLE(vc))
+ update_screen(vc);
/* fall through */
case 2: /* erase whole display */
count = vc->vc_cols * vc->vc_rows;
OpenPOWER on IntegriCloud