[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>

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);
 	}
 

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... */

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 */

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 {