summaryrefslogtreecommitdiffstats
path: root/drivers/char/drm
diff options
context:
space:
mode:
authorDave Airlie <airlied@starflyer.(none)>2005-10-24 18:41:39 +1000
committerDave Airlie <airlied@linux.ie>2005-10-24 18:41:39 +1000
commit67e1a014fbc0e472ccc55766a63640a767ede3bf (patch)
treeb8033bfeb4e9ab2b12e6050565b7d815edd469b3 /drivers/char/drm
parent5fb4dc9bf5e3af1ae91be97108bc3b1233252ddf (diff)
downloadlinux-67e1a014fbc0e472ccc55766a63640a767ede3bf.tar.gz
linux-67e1a014fbc0e472ccc55766a63640a767ede3bf.tar.bz2
linux-67e1a014fbc0e472ccc55766a63640a767ede3bf.zip
drm: fix warning on 64-bit platforms..
This looks ugly, but it is the only thing that makes sense that doesn't change the API. Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/char/drm')
-rw-r--r--drivers/char/drm/drm_bufs.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/char/drm/drm_bufs.c b/drivers/char/drm/drm_bufs.c
index 58e513a44740..319bdea8de8a 100644
--- a/drivers/char/drm/drm_bufs.c
+++ b/drivers/char/drm/drm_bufs.c
@@ -309,7 +309,9 @@ int drm_addmap_ioctl(struct inode *inode, struct file *filp,
if (copy_to_user(argp, maplist->map, sizeof(drm_map_t)))
return -EFAULT;
- if (put_user((void *)maplist->user_token, &argp->handle))
+
+ /* avoid a warning on 64-bit, this casting isn't very nice, but the API is set so too late */
+ if (put_user((void *)(unsigned long)maplist->user_token, &argp->handle))
return -EFAULT;
return 0;
}