projects
/
GitHub
/
moto-9609
/
android_kernel_motorola_exynos9610.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5fb4dc9
)
drm: fix warning on 64-bit platforms..
author
Dave Airlie
<airlied@starflyer.(none)>
Mon, 24 Oct 2005 08:41:39 +0000
(18:41 +1000)
committer
Dave Airlie
<airlied@linux.ie>
Mon, 24 Oct 2005 08:41:39 +0000
(18:41 +1000)
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>
drivers/char/drm/drm_bufs.c
patch
|
blob
|
blame
|
history
diff --git
a/drivers/char/drm/drm_bufs.c
b/drivers/char/drm/drm_bufs.c
index 58e513a44740f1a8d63ba62356cd7a6ccfbdaed1..319bdea8de8a63c7db21caa72ac1481e3f1330bb 100644
(file)
--- 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;
}