|
@@ -951,6 +951,7 @@ static struct {
|
|
long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
|
|
long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
|
|
{
|
|
{
|
|
unsigned int nr = DRM_IOCTL_NR(cmd);
|
|
unsigned int nr = DRM_IOCTL_NR(cmd);
|
|
|
|
+ struct drm_file *file_priv = filp->private_data;
|
|
drm_ioctl_compat_t *fn;
|
|
drm_ioctl_compat_t *fn;
|
|
int ret;
|
|
int ret;
|
|
|
|
|
|
@@ -965,19 +966,14 @@ long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
|
|
if (!fn)
|
|
if (!fn)
|
|
return drm_ioctl(filp, cmd, arg);
|
|
return drm_ioctl(filp, cmd, arg);
|
|
|
|
|
|
- if (drm_compat_ioctls[nr].name) {
|
|
|
|
- struct drm_file *file_priv = filp->private_data;
|
|
|
|
- DRM_DEBUG("pid=%d, dev=0x%lx, auth=%d, %s\n",
|
|
|
|
- task_pid_nr(current),
|
|
|
|
- (long)old_encode_dev(file_priv->minor->kdev->devt),
|
|
|
|
- file_priv->authenticated,
|
|
|
|
- drm_compat_ioctls[nr].name);
|
|
|
|
- ret = (*fn) (filp, cmd, arg);
|
|
|
|
- if (ret)
|
|
|
|
- DRM_DEBUG("ret = %d\n", ret);
|
|
|
|
- } else {
|
|
|
|
- ret = (*fn) (filp, cmd, arg);
|
|
|
|
- }
|
|
|
|
|
|
+ DRM_DEBUG("pid=%d, dev=0x%lx, auth=%d, %s\n",
|
|
|
|
+ task_pid_nr(current),
|
|
|
|
+ (long)old_encode_dev(file_priv->minor->kdev->devt),
|
|
|
|
+ file_priv->authenticated,
|
|
|
|
+ drm_compat_ioctls[nr].name);
|
|
|
|
+ ret = (*fn)(filp, cmd, arg);
|
|
|
|
+ if (ret)
|
|
|
|
+ DRM_DEBUG("ret = %d\n", ret);
|
|
return ret;
|
|
return ret;
|
|
}
|
|
}
|
|
EXPORT_SYMBOL(drm_compat_ioctl);
|
|
EXPORT_SYMBOL(drm_compat_ioctl);
|