Merge v5.3-rc1 into drm-misc-next

[sfrench/cifs-2.6.git] / drivers / gpu / drm / drm_ioc32.c

diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c
index a16b6dc2fa4749529a3d4dc94cfc8a43aa3cacbe..22c7fd7196c82b1c0ea6e3c288471323fe9396d1 100644 (file)
--- a/drivers/gpu/drm/drm_ioc32.c
+++ b/drivers/gpu/drm/drm_ioc32.c
@@ -108,7 +108,7 @@ static int compat_drm_version(struct file *file, unsigned int cmd,
                .desc = compat_ptr(v32.desc),
        };
        err = drm_ioctl_kernel(file, drm_version, &v,
-                              DRM_UNLOCKED|DRM_RENDER_ALLOW);
+                              DRM_RENDER_ALLOW);
        if (err)
                return err;
 
@@ -142,7 +142,7 @@ static int compat_drm_getunique(struct file *file, unsigned int cmd,
                .unique = compat_ptr(uq32.unique),
        };
 
-       err = drm_ioctl_kernel(file, drm_getunique, &uq, DRM_UNLOCKED);
+       err = drm_ioctl_kernel(file, drm_getunique, &uq, 0);
        if (err)
                return err;
 
@@ -181,7 +181,7 @@ static int compat_drm_getmap(struct file *file, unsigned int cmd,
                return -EFAULT;
 
        map.offset = m32.offset;
-       err = drm_ioctl_kernel(file, drm_legacy_getmap_ioctl, &map, DRM_UNLOCKED);
+       err = drm_ioctl_kernel(file, drm_legacy_getmap_ioctl, &map, 0);
        if (err)
                return err;
 
@@ -267,7 +267,7 @@ static int compat_drm_getclient(struct file *file, unsigned int cmd,
 
        client.idx = c32.idx;
 
-       err = drm_ioctl_kernel(file, drm_getclient, &client, DRM_UNLOCKED);
+       err = drm_ioctl_kernel(file, drm_getclient, &client, 0);
        if (err)
                return err;
 
@@ -297,7 +297,7 @@ static int compat_drm_getstats(struct file *file, unsigned int cmd,
        drm_stats32_t __user *argp = (void __user *)arg;
        int err;
 
-       err = drm_ioctl_kernel(file, drm_noop, NULL, DRM_UNLOCKED);
+       err = drm_ioctl_kernel(file, drm_noop, NULL, 0);
        if (err)
                return err;
 
@@ -895,8 +895,7 @@ static int compat_drm_mode_addfb2(struct file *file, unsigned int cmd,
                           sizeof(req64.modifier)))
                return -EFAULT;
 
-       err = drm_ioctl_kernel(file, drm_mode_addfb2, &req64,
-                              DRM_UNLOCKED);
+       err = drm_ioctl_kernel(file, drm_mode_addfb2, &req64, 0);
        if (err)
                return err;