diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-16 02:46:15 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-16 02:46:15 -0400 |
| commit | c5f977a0d2d6a8f02f32139b5dd129e52073f38f (patch) | |
| tree | 82180b8f21992312ad78becf759f21b9110e72ca /drivers/char/vt.c | |
| parent | f3d242e8f2bf12cb45eb35b7d2e69483d1209b13 (diff) | |
| parent | 065d9cac98a5406ecd5a1368f8fd38f55739dee9 (diff) | |
| download | op-kernel-dev-c5f977a0d2d6a8f02f32139b5dd129e52073f38f.zip op-kernel-dev-c5f977a0d2d6a8f02f32139b5dd129e52073f38f.tar.gz | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/char/vt.c')
| -rw-r--r-- | drivers/char/vt.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/char/vt.c b/drivers/char/vt.c index 1e33cb0..e91268e 100644 --- a/drivers/char/vt.c +++ b/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); |
