diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-09-02 09:52:55 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-09-02 09:52:55 +1000 |
| commit | 2254f637dbd18f6432da526552d19a616ffbf8d6 (patch) | |
| tree | c526475bcd8c7c82a8da39aa25e466a966d17072 /drivers/gpu/drm | |
| parent | a5b6f74e64f42ea2cfc0f04be59369471cbc8a94 (diff) | |
| download | linux-stable-2254f637dbd18f6432da526552d19a616ffbf8d6.tar.gz linux-stable-2254f637dbd18f6432da526552d19a616ffbf8d6.tar.bz2 linux-stable-2254f637dbd18f6432da526552d19a616ffbf8d6.zip | |
drm/nouveau: fix up 32-bit ioctls and device wake up.
Noticed by kbuild test robot.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_ioc32.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_ioctl.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_ioc32.c b/drivers/gpu/drm/nouveau/nouveau_ioc32.c index 08214bcdcb12..c1a7e5a73a26 100644 --- a/drivers/gpu/drm/nouveau/nouveau_ioc32.c +++ b/drivers/gpu/drm/nouveau/nouveau_ioc32.c @@ -63,7 +63,7 @@ long nouveau_compat_ioctl(struct file *filp, unsigned int cmd, if (fn != NULL) ret = (*fn)(filp, cmd, arg); else - ret = drm_ioctl(filp, cmd, arg); + ret = nouveau_drm_ioctl(filp, cmd, arg); return ret; } diff --git a/drivers/gpu/drm/nouveau/nouveau_ioctl.h b/drivers/gpu/drm/nouveau/nouveau_ioctl.h index ef2b2906d9e6..3b9f2e5463a7 100644 --- a/drivers/gpu/drm/nouveau/nouveau_ioctl.h +++ b/drivers/gpu/drm/nouveau/nouveau_ioctl.h @@ -2,5 +2,6 @@ #define __NOUVEAU_IOCTL_H__ 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 |