Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

Noticed by kbuild test robot.

Signed-off-by: Dave Airlie <airlied@redhat.com>

+2 -1
+1 -1
drivers/gpu/drm/nouveau/nouveau_ioc32.c
··· 63 63 if (fn != NULL) 64 64 ret = (*fn)(filp, cmd, arg); 65 65 else 66 - ret = drm_ioctl(filp, cmd, arg); 66 + ret = nouveau_drm_ioctl(filp, cmd, arg); 67 67 68 68 return ret; 69 69 }
+1
drivers/gpu/drm/nouveau/nouveau_ioctl.h
··· 2 2 #define __NOUVEAU_IOCTL_H__ 3 3 4 4 long nouveau_compat_ioctl(struct file *, unsigned int cmd, unsigned long arg); 5 + long nouveau_drm_ioctl(struct file *, unsigned int cmd, unsigned long arg); 5 6 6 7 #endif