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;
 }