projects/linux·commit 9e0ba741

drivers/char/vt.c:vc_do_resize(): local var `end' should be unsigned long

9e0ba741 · qiaochong <[email protected]> · 2010-08-09 17:21:27 -07:00

According include/linux/console_struct.h,vc_scr_end is unsigned long.

struct vc_data {
    unsigned short  vc_num;         /* Console number */
    unsigned int    vc_cols;        /* [#] Console size */
    unsigned int    vc_rows;
    unsigned int    vc_size_row;        /* Bytes per row */
    unsigned int    vc_scan_lines;      /* # of scan lines */
    unsigned long   vc_origin;      /* [!] Start of real screen */
    unsigned long   vc_scr_end;     /* [!] End of real screen */
    unsigned long   vc_visible_origin;  /* [!] Top of visible window */
    unsigned int    vc_top, vc_bottom;  /* Scrolling region */
    const struct consw *vc_sw;
    unsigned short  *vc_screenbuf;
...
}

Signed-off-by: qiaochong <[email protected]>
Cc: Greg KH <[email protected]>
Cc: Alan Cox <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
Commit
9e0ba741aabdf129d561e62d207c75146adef5e8
Parents
02f0777a

Changes

1 files changed · +2 −1

FileStatusAddDelContent
drivers/char/vt.cmodified+2−1View file

drivers/char/vt.c

View file
diff --git a/drivers/char/vt.c b/drivers/char/vt.c
index cff1d4b..44f03dd 100644
--- a/drivers/char/vt.c
+++ b/drivers/char/vt.c
@@ -837,9 +837,10 @@ static int vc_do_resize(struct tty_struct *tty, struct vc_data *vc,
unsigned int cols, unsigned int lines)
{
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 new_cols, new_rows, new_row_size, new_screen_size;
- unsigned int end, user;
+ unsigned int user;
unsigned short *newscreen;
WARN_CONSOLE_UNLOCKED();