diff --git a/[refs] b/[refs]
index c832f1024e35..eb84d2a0883f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5fb4dc9bf5e3af1ae91be97108bc3b1233252ddf
+refs/heads/master: 67e1a014fbc0e472ccc55766a63640a767ede3bf
diff --git a/trunk/drivers/char/drm/drm_bufs.c b/trunk/drivers/char/drm/drm_bufs.c
index 58e513a44740..319bdea8de8a 100644
--- a/trunk/drivers/char/drm/drm_bufs.c
+++ b/trunk/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;
 }