p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Noticed by kbuild test robot.

Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Dave Airlie 2013-09-02 09:52:55 +10:00
parent a5b6f74e64
commit 2254f637db
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/nouveau/nouveau_ioc32.c
View File

@ -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
drivers/gpu/drm/nouveau/nouveau_ioctl.h
View File

@ -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