Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

[linux-2.6-microblaze.git] / drivers / gpu / drm / drm_ioc32.c

diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c
index 5d82891..49a743f 100644 (file)
--- a/drivers/gpu/drm/drm_ioc32.c
+++ b/drivers/gpu/drm/drm_ioc32.c
@@ -972,6 +972,7 @@ long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 {
        unsigned int nr = DRM_IOCTL_NR(cmd);
        struct drm_file *file_priv = filp->private_data;
+       struct drm_device *dev = file_priv->minor->dev;
        drm_ioctl_compat_t *fn;
        int ret;
 
@@ -986,14 +987,14 @@ long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
        if (!fn)
                return drm_ioctl(filp, cmd, arg);
 
-       DRM_DEBUG("comm=\"%s\", pid=%d, dev=0x%lx, auth=%d, %s\n",
-                 current->comm, task_pid_nr(current),
-                 (long)old_encode_dev(file_priv->minor->kdev->devt),
-                 file_priv->authenticated,
-                 drm_compat_ioctls[nr].name);
+       drm_dbg_core(dev, "comm=\"%s\", pid=%d, dev=0x%lx, auth=%d, %s\n",
+                    current->comm, 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);
+               drm_dbg_core(dev, "ret = %d\n", ret);
        return ret;
 }
 EXPORT_SYMBOL(drm_compat_ioctl);