diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-04-21 23:20:08 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-04-21 23:20:08 +0200 |
| commit | 3b8a1f45e1b3886593a7cbb0aca09d4d0a9e23df (patch) | |
| tree | e9f4ada62ee0d88c7c389cbf66bf2f7ec897c680 /drivers/tty/vt/vt.c | |
| parent | tty:serial_core: Spelling mistake (diff) | |
| parent | Linux 5.1-rc6 (diff) | |
| download | linux-3b8a1f45e1b3886593a7cbb0aca09d4d0a9e23df.tar.xz linux-3b8a1f45e1b3886593a7cbb0aca09d4d0a9e23df.zip | |
Merge 5.1-rc6 into tty-next
We want the serial/tty fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/vt/vt.c')
| -rw-r--r-- | drivers/tty/vt/vt.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c index 721edee50234..693b3b4176f5 100644 --- a/drivers/tty/vt/vt.c +++ b/drivers/tty/vt/vt.c @@ -1520,7 +1520,8 @@ static void csi_J(struct vc_data *vc, int vpar) return; } scr_memsetw(start, vc->vc_video_erase_char, 2 * count); - update_region(vc, (unsigned long) start, count); + if (con_should_update(vc)) + do_update_region(vc, (unsigned long) start, count); vc->vc_need_wrap = 0; } |