Commit 1a36bf1d authored by Al Viro's avatar Al Viro

switch compat_drm_update_draw()

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 314ed736
...@@ -806,22 +806,11 @@ static int compat_drm_update_draw(struct file *file, unsigned int cmd, ...@@ -806,22 +806,11 @@ static int compat_drm_update_draw(struct file *file, unsigned int cmd,
unsigned long arg) unsigned long arg)
{ {
drm_update_draw32_t update32; drm_update_draw32_t update32;
struct drm_update_draw __user *request;
int err;
if (copy_from_user(&update32, (void __user *)arg, sizeof(update32))) if (copy_from_user(&update32, (void __user *)arg, sizeof(update32)))
return -EFAULT; return -EFAULT;
request = compat_alloc_user_space(sizeof(*request)); return drm_ioctl_kernel(file, drm_noop, NULL,
if (!request || DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY);
__put_user(update32.handle, &request->handle) ||
__put_user(update32.type, &request->type) ||
__put_user(update32.num, &request->num) ||
__put_user(update32.data, &request->data))
return -EFAULT;
err = drm_ioctl(file, DRM_IOCTL_UPDATE_DRAW, (unsigned long)request);
return err;
} }
#endif #endif
...@@ -969,7 +958,7 @@ static struct { ...@@ -969,7 +958,7 @@ static struct {
DRM_IOCTL32_DEF(DRM_IOCTL_SG_ALLOC, compat_drm_sg_alloc), DRM_IOCTL32_DEF(DRM_IOCTL_SG_ALLOC, compat_drm_sg_alloc),
DRM_IOCTL32_DEF(DRM_IOCTL_SG_FREE, compat_drm_sg_free), DRM_IOCTL32_DEF(DRM_IOCTL_SG_FREE, compat_drm_sg_free),
#if defined(CONFIG_X86) || defined(CONFIG_IA64) #if defined(CONFIG_X86) || defined(CONFIG_IA64)
[DRM_IOCTL_NR(DRM_IOCTL_UPDATE_DRAW32)].fn = compat_drm_update_draw, DRM_IOCTL32_DEF(DRM_IOCTL_UPDATE_DRAW, compat_drm_update_draw),
#endif #endif
[DRM_IOCTL_NR(DRM_IOCTL_WAIT_VBLANK32)].fn = compat_drm_wait_vblank, [DRM_IOCTL_NR(DRM_IOCTL_WAIT_VBLANK32)].fn = compat_drm_wait_vblank,
#if defined(CONFIG_X86) || defined(CONFIG_IA64) #if defined(CONFIG_X86) || defined(CONFIG_IA64)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment