diff options
| author | Alexander Viro <viro@www.linux.org.uk> | 2004-07-29 08:48:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-07-29 08:48:29 -0700 |
| commit | db39752052264d6fdab1f40c088b025c8df56956 (patch) | |
| tree | 383beb04c9102b1f8f64103af3e4f2fa5f6621d8 | |
| parent | 728702c6a1d305b4e73b3de461c1a0d9931f4272 (diff) | |
[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>
| -rw-r--r-- | drivers/char/vt_ioctl.c | 4 | ||||
| -rw-r--r-- | drivers/video/console/fbcon.c | 2 | ||||
| -rw-r--r-- | include/linux/console_struct.h | 2 | ||||
| -rw-r--r-- | include/linux/kd.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/drivers/char/vt_ioctl.c b/drivers/char/vt_ioctl.c index bf05ec6c1d3d..682b44e9daf0 100644 --- 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 f193c72ecc06..3077b7792d30 100644 --- 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 df81e37a9884..a9a2a486234c 100644 --- 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 834885b8da63..28be4fbe9044 100644 --- 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 { |