浏览代码

drm/nouveau: fix up 32-bit ioctls and device wake up.

Noticed by kbuild test robot.

Signed-off-by: Dave Airlie <airlied@redhat.com>
Dave Airlie 12 年之前
父节点
当前提交
2254f637db
共有 2 个文件被更改,包括 2 次插入1 次删除
  1. 1 1
      drivers/gpu/drm/nouveau/nouveau_ioc32.c
  2. 1 0
      drivers/gpu/drm/nouveau/nouveau_ioctl.h

+ 1 - 1
drivers/gpu/drm/nouveau/nouveau_ioc32.c

@@ -63,7 +63,7 @@ long nouveau_compat_ioctl(struct file *filp, unsigned int cmd,
 	if (fn != NULL)
 	if (fn != NULL)
 		ret = (*fn)(filp, cmd, arg);
 		ret = (*fn)(filp, cmd, arg);
 	else
 	else
-		ret = drm_ioctl(filp, cmd, arg);
+		ret = nouveau_drm_ioctl(filp, cmd, arg);
 
 
 	return ret;
 	return ret;
 }
 }

+ 1 - 0
drivers/gpu/drm/nouveau/nouveau_ioctl.h

@@ -2,5 +2,6 @@
 #define __NOUVEAU_IOCTL_H__
 #define __NOUVEAU_IOCTL_H__
 
 
 long nouveau_compat_ioctl(struct file *, unsigned int cmd, unsigned long arg);
 long nouveau_compat_ioctl(struct file *, unsigned int cmd, unsigned long arg);
+long nouveau_drm_ioctl(struct file *, unsigned int cmd, unsigned long arg);
 
 
 #endif
 #endif