From: Al Viro <viro@zeniv.linux.org.uk>
Date: Thu, 6 Jul 2017 02:00:00 -0400
Subject: Fix trivial misannotations
Git-commit: b87b786b1fa1aa1bba33da22c8bb6b3ec7b608d2
Patch-mainline: v4.13-rc1
References: FATE#326289 FATE#326079 FATE#326049 FATE#322398 FATE#326166

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Acked-by: Petr Tesarik <ptesarik@suse.com>
---
 drivers/gpu/drm/drm_ioc32.c     |    4 ++--
 drivers/gpu/drm/mga/mga_ioc32.c |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

--- a/drivers/gpu/drm/drm_ioc32.c
+++ b/drivers/gpu/drm/drm_ioc32.c
@@ -343,7 +343,7 @@ static int compat_drm_markbufs(struct fi
 {
 	drm_buf_desc32_t b32;
 	drm_buf_desc32_t __user *argp = (void __user *)arg;
-	struct drm_buf_desc __user buf;
+	struct drm_buf_desc buf;
 
 	if (copy_from_user(&b32, argp, sizeof(b32)))
 		return -EFAULT;
@@ -870,7 +870,7 @@ static int compat_drm_mode_addfb2(struct
 				  unsigned long arg)
 {
 	struct drm_mode_fb_cmd232 __user *argp = (void __user *)arg;
-	struct drm_mode_fb_cmd2 __user req64;
+	struct drm_mode_fb_cmd2 req64;
 	int err;
 
 	if (copy_from_user(&req64, argp,
--- a/drivers/gpu/drm/mga/mga_ioc32.c
+++ b/drivers/gpu/drm/mga/mga_ioc32.c
@@ -115,7 +115,7 @@ static int compat_mga_dma_bootstrap(stru
 				    unsigned long arg)
 {
 	drm_mga_dma_bootstrap32_t dma_bootstrap32;
-	drm_mga_dma_bootstrap_t __user dma_bootstrap;
+	drm_mga_dma_bootstrap_t dma_bootstrap;
 	int err;
 
 	if (copy_from_user(&dma_bootstrap32, (void __user *)arg,