Commit 5687100a authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'tty-3.7-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

Pull TTY fix from Greg Kroah-Hartman:
 "Here is a single fix for a reported regression in 3.7-rc5 for the tty
  layer.  This fix has been in the linux-next tree and solves the
  reported problem.

  Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"

* tag 'tty-3.7-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
  tty vt: Fix a regression in command line edition
parents c854539d b1a925f4
...@@ -539,25 +539,25 @@ static void insert_char(struct vc_data *vc, unsigned int nr) ...@@ -539,25 +539,25 @@ static void insert_char(struct vc_data *vc, unsigned int nr)
{ {
unsigned short *p = (unsigned short *) vc->vc_pos; unsigned short *p = (unsigned short *) vc->vc_pos;
scr_memmovew(p + nr, p, vc->vc_cols - vc->vc_x); scr_memmovew(p + nr, p, (vc->vc_cols - vc->vc_x) * 2);
scr_memsetw(p, vc->vc_video_erase_char, nr * 2); scr_memsetw(p, vc->vc_video_erase_char, nr * 2);
vc->vc_need_wrap = 0; vc->vc_need_wrap = 0;
if (DO_UPDATE(vc)) if (DO_UPDATE(vc))
do_update_region(vc, (unsigned long) p, do_update_region(vc, (unsigned long) p,
(vc->vc_cols - vc->vc_x) / 2 + 1); vc->vc_cols - vc->vc_x);
} }
static void delete_char(struct vc_data *vc, unsigned int nr) static void delete_char(struct vc_data *vc, unsigned int nr)
{ {
unsigned short *p = (unsigned short *) vc->vc_pos; unsigned short *p = (unsigned short *) vc->vc_pos;
scr_memcpyw(p, p + nr, vc->vc_cols - vc->vc_x - nr); scr_memcpyw(p, p + nr, (vc->vc_cols - vc->vc_x - nr) * 2);
scr_memsetw(p + vc->vc_cols - vc->vc_x - nr, vc->vc_video_erase_char, scr_memsetw(p + vc->vc_cols - vc->vc_x - nr, vc->vc_video_erase_char,
nr * 2); nr * 2);
vc->vc_need_wrap = 0; vc->vc_need_wrap = 0;
if (DO_UPDATE(vc)) if (DO_UPDATE(vc))
do_update_region(vc, (unsigned long) p, do_update_region(vc, (unsigned long) p,
(vc->vc_cols - vc->vc_x) / 2); vc->vc_cols - vc->vc_x);
} }
static int softcursor_original; static int softcursor_original;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment