[PATCH 2/2] drm: Resolve shadow warning for s32

From: Jeff Kirsher
Date: Fri Aug 29 2014 - 11:22:45 EST

From: Mark Rustad <mark.d.rustad@xxxxxxxxx>

Resolve a shadow warning produced in a W=2 build by changing
the name of a local variable from s32 to ds32. Since s32 clashes
with the well-known typedef, any macro expansion that could
someday be used that might attempt to use an s32 type would fail
to compile. It is best to eliminate the hazard.

Signed-off-by: Mark Rustad <mark.d.rustad@xxxxxxxxx>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@xxxxxxxxx>
drivers/gpu/drm/drm_ioc32.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c
index 2f4c4343..777ffd8 100644
--- a/drivers/gpu/drm/drm_ioc32.c
+++ b/drivers/gpu/drm/drm_ioc32.c
@@ -339,7 +339,7 @@ typedef struct drm_stats32 {
static int compat_drm_getstats(struct file *file, unsigned int cmd,
unsigned long arg)
- drm_stats32_t s32;
+ drm_stats32_t ds32;
drm_stats32_t __user *argp = (void __user *)arg;
struct drm_stats __user *stats;
int i, err;
@@ -352,14 +352,14 @@ static int compat_drm_getstats(struct file *file, unsigned int cmd,
if (err)
return err;

- if (__get_user(s32.count, &stats->count))
+ if (__get_user(ds32.count, &stats->count))
return -EFAULT;
for (i = 0; i < 15; ++i)
- if (__get_user(s32.data[i].value, &stats->data[i].value)
- || __get_user(s32.data[i].type, &stats->data[i].type))
+ if (__get_user(ds32.data[i].value, &stats->data[i].value)
+ || __get_user(ds32.data[i].type, &stats->data[i].type))
return -EFAULT;

- if (copy_to_user(argp, &s32, sizeof(s32)))
+ if (copy_to_user(argp, &ds32, sizeof(ds32)))
return -EFAULT;
return 0;

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/