drm: Fix psb ioctl assignment
PATCH 6/6 drm: Fix psb ioctl assignment
Replace drm_ioctl with drm_unlocked_ioctl.
Signed-off-by Tom Zanussi <[email protected]>
--- drivers/gpu/drm-psb/drm_drv.c | 2 ++ drivers/gpu/drm-psb/psb_drv.c | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-)
drivers/gpu/drm-psb/drm_drv.c +2 -0
@@ -663,7 +663,9 @@ long drm_unlocked_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) ((ioctl->flags & DRM_MASTER) && !file_priv->master)) { retcode = -EACCES; } else { +lock_kernel (); retcode =func (dev, kdata, file_priv); +unlock_kernel (); }if ((retcode ==0 ) && (cmd &IOC_OUT )) {
drivers/gpu/drm-psb/psb_drv.c +1 -1
@@ -984,7 +984,7 @@ static struct drm_driver driver = { .owner = THIS_MODULE, .open = drm_open, .release = psb_release, - .ioctl = drm_ioctl, + .unlocked_ioctl = drm_unlocked_ioctl, .mmap = drm_mmap, .poll = psb_poll, .fasync = drm_fasync,
Signature · 1 line
1.7.0.4