aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorAlexander Viro <viro@www.linux.org.uk>2004-07-29 08:48:53 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-07-29 08:48:53 -0700
commit53699287a25ea8c6d3a3f1b3404d8ebbcba6b580 (patch)
tree056e3c72acd077611c33593a0556c15ee84a9848 /fs
parentcfd3aaa3f86eb36180e507c30be08779c438705d (diff)
downloadhistory-53699287a25ea8c6d3a3f1b3404d8ebbcba6b580.tar.gz
[PATCH] cmap annotations
fb_set_cmap() and fb_copy_cmap() split into kernel and userland versions. fb_cmap, fb_image and fb_cursor split and annotated. fixed bug in sbuslib.c that used to call "userland" version of fb_set_cmap() when kernel one was need (RGB data was already copied into kernel space). Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/compat_ioctl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
index 145e974ce882d1..dc1a2d2c41d5ed 100644
--- a/fs/compat_ioctl.c
+++ b/fs/compat_ioctl.c
@@ -851,7 +851,7 @@ struct fb_cmap32 {
static int fb_getput_cmap(unsigned int fd, unsigned int cmd, unsigned long arg)
{
- struct fb_cmap __user *cmap;
+ struct fb_cmap_user __user *cmap;
struct fb_cmap32 __user *cmap32;
__u32 data;
int err;