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

airlied · airlied · commit 2254f637dbd1 · 2013-09-02T09:52:55.000+10:00
Noticed by kbuild test robot.

Signed-off-by: Dave Airlie &lt;airlied@redhat.com&gt;
diff --git 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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ long nouveau_compat_ioctl(struct file *filp, unsigned int cmd,`
`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`	`}`