[PATCH] console_font_op annotated

->vc_font switched to console_font (from console_font_op, of all things!)
console_font_op annotated (->data is finally makred __user).

Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/char/vt_ioctl.c b/drivers/char/vt_ioctl.c
index bf05ec6c1d3da6a5fffc30fba1c00c5b6d29132a..682b44e9daf0e5089143f32ca1bae9b8d1fedf68 100644 (file)
--- a/drivers/char/vt_ioctl.c
+++ b/drivers/char/vt_ioctl.c
@@ -915,7 +915,7 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
                op.width = 8;
                op.height = 0;
                op.charcount = 256;
-               op.data = (char *) arg;
+               op.data = up;
                return con_font_op(fg_console, &op);
        }
 
@@ -925,7 +925,7 @@ int vt_ioctl(struct tty_struct *tty, struct file * file,
                op.width = 8;
                op.height = 32;
                op.charcount = 256;
-               op.data = (char *) arg;
+               op.data = up;
                return con_font_op(fg_console, &op);
        }
 

diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index f193c72ecc0677902094b1677a437dc57fa50ac8..3077b7792d30495a2b4c6c61defe672b4b205b00 100644 (file)
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -2162,7 +2162,7 @@ static int fbcon_do_set_font(struct vc_data *vc, int w, int h,
 static int fbcon_copy_font(struct vc_data *vc, int con)
 {
        struct display *od = &fb_display[con];
-       struct console_font_op *f = &vc->vc_font;
+       struct console_font *f = &vc->vc_font;
 
        if (od->fontdata == f->data)
                return 0;       /* already the same font... */

diff --git a/include/linux/console_struct.h b/include/linux/console_struct.h
index df81e37a988438ab0c29ddfcccbf379bb769bab9..a9a2a486234c0548892bbf4579fc9c64030b19a1 100644 (file)
--- a/include/linux/console_struct.h
+++ b/include/linux/console_struct.h
@@ -40,7 +40,7 @@ struct vc_data {
        unsigned long   vc_pos;                 /* Cursor address */
        /* fonts */     
        unsigned short  vc_hi_font_mask;        /* [#] Attribute set for upper 256 chars of font or 0 if not supported */
-       struct console_font_op vc_font;         /* Current VC font set */
+       struct console_font vc_font;            /* Current VC font set */
        unsigned short  vc_video_erase_char;    /* Background erase character */
        /* VT terminal data */
        unsigned int    vc_state;               /* Escape sequence parser state */

diff --git a/include/linux/kd.h b/include/linux/kd.h
index 834885b8da63e7546c016c5d8265b31fe529ca64..28be4fbe9044a988a16497746da884be5a5a22c6 100644 (file)
--- a/include/linux/kd.h
+++ b/include/linux/kd.h
@@ -149,7 +149,7 @@ struct console_font_op {
        unsigned int flags;     /* KD_FONT_FLAG_* */
        unsigned int width, height;     /* font size */
        unsigned int charcount;
-       unsigned char *data;    /* font data with height fixed to 32 */
+       unsigned char __user *data;     /* font data with height fixed to 32 */
 };
 
 struct console_font {