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 /include | |
| parent | 728702c6a1d305b4e73b3de461c1a0d9931f4272 (diff) | |
| download | history-db39752052264d6fdab1f40c088b025c8df56956.tar.gz | |
[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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/console_struct.h | 2 | ||||
| -rw-r--r-- | include/linux/kd.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/console_struct.h b/include/linux/console_struct.h index df81e37a988438..a9a2a486234c05 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 834885b8da63e7..28be4fbe9044a9 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 { |