diff options
-rw-r--r-- | drivers/gpu/drm/drm_drv.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/drm_fops.c | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/drm_info.c | 6 | ||||
-rw-r--r-- | include/drm/drmP.h | 1 |
4 files changed, 3 insertions, 7 deletions
diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c index 9fd4dd476d33..345be03c23db 100644 --- a/drivers/gpu/drm/drm_drv.c +++ b/drivers/gpu/drm/drm_drv.c | |||
@@ -315,8 +315,6 @@ long drm_ioctl(struct file *filp, | |||
315 | if (drm_device_is_unplugged(dev)) | 315 | if (drm_device_is_unplugged(dev)) |
316 | return -ENODEV; | 316 | return -ENODEV; |
317 | 317 | ||
318 | ++file_priv->ioctl_count; | ||
319 | |||
320 | if ((nr >= DRM_CORE_IOCTL_COUNT) && | 318 | if ((nr >= DRM_CORE_IOCTL_COUNT) && |
321 | ((nr < DRM_COMMAND_BASE) || (nr >= DRM_COMMAND_END))) | 319 | ((nr < DRM_COMMAND_BASE) || (nr >= DRM_COMMAND_END))) |
322 | goto err_i1; | 320 | goto err_i1; |
diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c index 97ebc828de5b..330f3dd8e9d0 100644 --- a/drivers/gpu/drm/drm_fops.c +++ b/drivers/gpu/drm/drm_fops.c | |||
@@ -232,7 +232,6 @@ static int drm_open_helper(struct inode *inode, struct file *filp, | |||
232 | goto out_put_pid; | 232 | goto out_put_pid; |
233 | } | 233 | } |
234 | 234 | ||
235 | priv->ioctl_count = 0; | ||
236 | /* for compatibility root is always authenticated */ | 235 | /* for compatibility root is always authenticated */ |
237 | priv->always_authenticated = capable(CAP_SYS_ADMIN); | 236 | priv->always_authenticated = capable(CAP_SYS_ADMIN); |
238 | priv->authenticated = priv->always_authenticated; | 237 | priv->authenticated = priv->always_authenticated; |
diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c index 7d5a152eeb02..31da45c582fc 100644 --- a/drivers/gpu/drm/drm_info.c +++ b/drivers/gpu/drm/drm_info.c | |||
@@ -186,14 +186,14 @@ int drm_clients_info(struct seq_file *m, void *data) | |||
186 | struct drm_file *priv; | 186 | struct drm_file *priv; |
187 | 187 | ||
188 | mutex_lock(&dev->struct_mutex); | 188 | mutex_lock(&dev->struct_mutex); |
189 | seq_printf(m, "a dev pid uid magic ioctls\n\n"); | 189 | seq_printf(m, "a dev pid uid magic\n\n"); |
190 | list_for_each_entry(priv, &dev->filelist, lhead) { | 190 | list_for_each_entry(priv, &dev->filelist, lhead) { |
191 | seq_printf(m, "%c %3d %5d %5d %10u %10lu\n", | 191 | seq_printf(m, "%c %3d %5d %5d %10u\n", |
192 | priv->authenticated ? 'y' : 'n', | 192 | priv->authenticated ? 'y' : 'n', |
193 | priv->minor->index, | 193 | priv->minor->index, |
194 | pid_vnr(priv->pid), | 194 | pid_vnr(priv->pid), |
195 | from_kuid_munged(seq_user_ns(m), priv->uid), | 195 | from_kuid_munged(seq_user_ns(m), priv->uid), |
196 | priv->magic, priv->ioctl_count); | 196 | priv->magic); |
197 | } | 197 | } |
198 | mutex_unlock(&dev->struct_mutex); | 198 | mutex_unlock(&dev->struct_mutex); |
199 | return 0; | 199 | return 0; |
diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 0670857b1420..5b6c33ce776f 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h | |||
@@ -438,7 +438,6 @@ struct drm_file { | |||
438 | struct pid *pid; | 438 | struct pid *pid; |
439 | kuid_t uid; | 439 | kuid_t uid; |
440 | drm_magic_t magic; | 440 | drm_magic_t magic; |
441 | unsigned long ioctl_count; | ||
442 | struct list_head lhead; | 441 | struct list_head lhead; |
443 | struct drm_minor *minor; | 442 | struct drm_minor *minor; |
444 | unsigned long lock_count; | 443 | unsigned long lock_count; |