Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 248648
b: refs/heads/master
c: f2ee4ae
h: refs/heads/master
v: v3
  • Loading branch information
Jiri Slaby authored and Greg Kroah-Hartman committed Apr 19, 2011
1 parent 79f33cc commit 474c4ee
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0e7f4194a0ef70c1d0d40152fa480a63719f35d5
refs/heads/master: f2ee4ae87d7781ddb5bf8da25591b9b79966f8ea
4 changes: 1 addition & 3 deletions trunk/drivers/tty/vt/vt.c
Original file line number Diff line number Diff line change
Expand Up @@ -858,7 +858,7 @@ static int vc_do_resize(struct tty_struct *tty, struct vc_data *vc,
{
unsigned long old_origin, new_origin, new_scr_end, rlth, rrem, err = 0;
unsigned long end;
unsigned int old_cols, old_rows, old_row_size, old_screen_size;
unsigned int old_rows, old_row_size;
unsigned int new_cols, new_rows, new_row_size, new_screen_size;
unsigned int user;
unsigned short *newscreen;
Expand Down Expand Up @@ -887,9 +887,7 @@ static int vc_do_resize(struct tty_struct *tty, struct vc_data *vc,
return -ENOMEM;

old_rows = vc->vc_rows;
old_cols = vc->vc_cols;
old_row_size = vc->vc_size_row;
old_screen_size = vc->vc_screenbuf_size;

err = resize_screen(vc, new_cols, new_rows, user);
if (err) {
Expand Down

0 comments on commit 474c4ee

Please sign in to comment.