tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 5687100a c854539d

+4 -4
+4 -4
drivers/tty/vt/vt.c
··· 539 539 { 540 540 unsigned short *p = (unsigned short *) vc->vc_pos; 541 541 542 - scr_memmovew(p + nr, p, vc->vc_cols - vc->vc_x); 542 + scr_memmovew(p + nr, p, (vc->vc_cols - vc->vc_x) * 2); 543 543 scr_memsetw(p, vc->vc_video_erase_char, nr * 2); 544 544 vc->vc_need_wrap = 0; 545 545 if (DO_UPDATE(vc)) 546 546 do_update_region(vc, (unsigned long) p, 547 - (vc->vc_cols - vc->vc_x) / 2 + 1); 547 + vc->vc_cols - vc->vc_x); 548 548 } 549 549 550 550 static void delete_char(struct vc_data *vc, unsigned int nr) 551 551 { 552 552 unsigned short *p = (unsigned short *) vc->vc_pos; 553 553 554 - scr_memcpyw(p, p + nr, vc->vc_cols - vc->vc_x - nr); 554 + scr_memcpyw(p, p + nr, (vc->vc_cols - vc->vc_x - nr) * 2); 555 555 scr_memsetw(p + vc->vc_cols - vc->vc_x - nr, vc->vc_video_erase_char, 556 556 nr * 2); 557 557 vc->vc_need_wrap = 0; 558 558 if (DO_UPDATE(vc)) 559 559 do_update_region(vc, (unsigned long) p, 560 - (vc->vc_cols - vc->vc_x) / 2); 560 + vc->vc_cols - vc->vc_x); 561 561 } 562 562 563 563 static int softcursor_original;