diff --git a/[refs] b/[refs] index a893799fdc66..c49cc15c5f89 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6d36ba629e0ef47a03d3703ee1d38143c25532a8 +refs/heads/master: 065d9cac98a5406ecd5a1368f8fd38f55739dee9 diff --git a/trunk/drivers/char/vt.c b/trunk/drivers/char/vt.c index 1e33cb032e07..e91268e86833 100644 --- a/trunk/drivers/char/vt.c +++ b/trunk/drivers/char/vt.c @@ -810,13 +810,14 @@ int vc_resize(struct vc_data *vc, unsigned int cols, unsigned int lines) * from the top and bottom of cursor position */ old_origin += (vc->vc_y - new_rows/2) * old_row_size; - end = old_origin + new_screen_size; + end = old_origin + (old_row_size * new_rows); } } else /* * Cursor near the top, copy contents from the top of buffer */ - end = (old_rows > new_rows) ? old_origin + new_screen_size : + end = (old_rows > new_rows) ? old_origin + + (old_row_size * new_rows) : vc->vc_scr_end; update_attr(vc);