git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
drivers
/
char
/
drm
/
r128_state.c
diff --git
a/drivers/char/drm/r128_state.c
b/drivers/char/drm/r128_state.c
index
6ec11b0
..
34ebcae
100644
(file)
--- a/
drivers/char/drm/r128_state.c
+++ b/
drivers/char/drm/r128_state.c
@@
-1271,7
+1271,7
@@
int r128_cce_clear( DRM_IOCTL_ARGS )
LOCK_TEST_WITH_RETURN( dev, filp );
LOCK_TEST_WITH_RETURN( dev, filp );
- DRM_COPY_FROM_USER_IOCTL( clear, (drm_r128_clear_t *) data,
+ DRM_COPY_FROM_USER_IOCTL( clear, (drm_r128_clear_t
__user
*) data,
sizeof(clear) );
RING_SPACE_TEST_WITH_RETURN( dev_priv );
sizeof(clear) );
RING_SPACE_TEST_WITH_RETURN( dev_priv );
@@
-1386,7
+1386,7
@@
int r128_cce_vertex( DRM_IOCTL_ARGS )
return DRM_ERR(EINVAL);
}
return DRM_ERR(EINVAL);
}
- DRM_COPY_FROM_USER_IOCTL( vertex, (drm_r128_vertex_t *) data,
+ DRM_COPY_FROM_USER_IOCTL( vertex, (drm_r128_vertex_t
__user
*) data,
sizeof(vertex) );
DRM_DEBUG( "pid=%d index=%d count=%d discard=%d\n",
sizeof(vertex) );
DRM_DEBUG( "pid=%d index=%d count=%d discard=%d\n",
@@
-1447,7
+1447,7
@@
int r128_cce_indices( DRM_IOCTL_ARGS )
return DRM_ERR(EINVAL);
}
return DRM_ERR(EINVAL);
}
- DRM_COPY_FROM_USER_IOCTL( elts, (drm_r128_indices_t *) data,
+ DRM_COPY_FROM_USER_IOCTL( elts, (drm_r128_indices_t
__user
*) data,
sizeof(elts) );
DRM_DEBUG( "pid=%d buf=%d s=%d e=%d d=%d\n", DRM_CURRENTPID,
sizeof(elts) );
DRM_DEBUG( "pid=%d buf=%d s=%d e=%d d=%d\n", DRM_CURRENTPID,
@@
-1512,7
+1512,7
@@
int r128_cce_blit( DRM_IOCTL_ARGS )
LOCK_TEST_WITH_RETURN( dev, filp );
LOCK_TEST_WITH_RETURN( dev, filp );
- DRM_COPY_FROM_USER_IOCTL( blit, (drm_r128_blit_t *) data,
+ DRM_COPY_FROM_USER_IOCTL( blit, (drm_r128_blit_t
__user
*) data,
sizeof(blit) );
DRM_DEBUG( "pid=%d index=%d\n", DRM_CURRENTPID, blit.idx );
sizeof(blit) );
DRM_DEBUG( "pid=%d index=%d\n", DRM_CURRENTPID, blit.idx );
@@
-1541,7
+1541,7
@@
int r128_cce_depth( DRM_IOCTL_ARGS )
LOCK_TEST_WITH_RETURN( dev, filp );
LOCK_TEST_WITH_RETURN( dev, filp );
- DRM_COPY_FROM_USER_IOCTL( depth, (drm_r128_depth_t *) data,
+ DRM_COPY_FROM_USER_IOCTL( depth, (drm_r128_depth_t
__user
*) data,
sizeof(depth) );
RING_SPACE_TEST_WITH_RETURN( dev_priv );
sizeof(depth) );
RING_SPACE_TEST_WITH_RETURN( dev_priv );
@@
-1571,7
+1571,7
@@
int r128_cce_stipple( DRM_IOCTL_ARGS )
LOCK_TEST_WITH_RETURN( dev, filp );
LOCK_TEST_WITH_RETURN( dev, filp );
- DRM_COPY_FROM_USER_IOCTL( stipple, (drm_r128_stipple_t *) data,
+ DRM_COPY_FROM_USER_IOCTL( stipple, (drm_r128_stipple_t
__user
*) data,
sizeof(stipple) );
if ( DRM_COPY_FROM_USER( &mask, stipple.mask,
sizeof(stipple) );
if ( DRM_COPY_FROM_USER( &mask, stipple.mask,
@@
-1605,7
+1605,7
@@
int r128_cce_indirect( DRM_IOCTL_ARGS )
return DRM_ERR(EINVAL);
}
return DRM_ERR(EINVAL);
}
- DRM_COPY_FROM_USER_IOCTL( indirect, (drm_r128_indirect_t *) data,
+ DRM_COPY_FROM_USER_IOCTL( indirect, (drm_r128_indirect_t
__user
*) data,
sizeof(indirect) );
DRM_DEBUG( "indirect: idx=%d s=%d e=%d d=%d\n",
sizeof(indirect) );
DRM_DEBUG( "indirect: idx=%d s=%d e=%d d=%d\n",
@@
-1674,7
+1674,7
@@
int r128_getparam( DRM_IOCTL_ARGS )
return DRM_ERR(EINVAL);
}
return DRM_ERR(EINVAL);
}
- DRM_COPY_FROM_USER_IOCTL( param, (drm_r128_getparam_t *)data,
+ DRM_COPY_FROM_USER_IOCTL( param, (drm_r128_getparam_t
__user
*)data,
sizeof(param) );
DRM_DEBUG( "pid=%d\n", DRM_CURRENTPID );
sizeof(param) );
DRM_DEBUG( "pid=%d\n", DRM_CURRENTPID );