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
/
radeon_cp.c
diff --git
a/drivers/char/drm/radeon_cp.c
b/drivers/char/drm/radeon_cp.c
index
e145c78
..
f696490
100644
(file)
--- a/
drivers/char/drm/radeon_cp.c
+++ b/
drivers/char/drm/radeon_cp.c
@@
-1358,7
+1358,7
@@
int radeon_cp_init( DRM_IOCTL_ARGS )
LOCK_TEST_WITH_RETURN( dev, filp );
LOCK_TEST_WITH_RETURN( dev, filp );
- DRM_COPY_FROM_USER_IOCTL( init, (drm_radeon_init_t *)data, sizeof(init) );
+ DRM_COPY_FROM_USER_IOCTL( init, (drm_radeon_init_t
__user
*)data, sizeof(init) );
switch ( init.func ) {
case RADEON_INIT_CP:
switch ( init.func ) {
case RADEON_INIT_CP:
@@
-1407,7
+1407,7
@@
int radeon_cp_stop( DRM_IOCTL_ARGS )
LOCK_TEST_WITH_RETURN( dev, filp );
LOCK_TEST_WITH_RETURN( dev, filp );
- DRM_COPY_FROM_USER_IOCTL( stop, (drm_radeon_cp_stop_t *)data, sizeof(stop) );
+ DRM_COPY_FROM_USER_IOCTL( stop, (drm_radeon_cp_stop_t
__user
*)data, sizeof(stop) );
if (!dev_priv->cp_running)
return 0;
if (!dev_priv->cp_running)
return 0;
@@
-1712,11
+1712,12
@@
int radeon_cp_buffers( DRM_IOCTL_ARGS )
DRM_DEVICE;
drm_device_dma_t *dma = dev->dma;
int ret = 0;
DRM_DEVICE;
drm_device_dma_t *dma = dev->dma;
int ret = 0;
+ drm_dma_t __user *argp = (void __user *)data;
drm_dma_t d;
LOCK_TEST_WITH_RETURN( dev, filp );
drm_dma_t d;
LOCK_TEST_WITH_RETURN( dev, filp );
- DRM_COPY_FROM_USER_IOCTL( d,
(drm_dma_t *)data
, sizeof(d) );
+ DRM_COPY_FROM_USER_IOCTL( d,
argp
, sizeof(d) );
/* Please don't send us buffers.
*/
/* Please don't send us buffers.
*/
@@
-1740,7
+1741,7
@@
int radeon_cp_buffers( DRM_IOCTL_ARGS )
ret = radeon_cp_get_buffers( filp, dev, &d );
}
ret = radeon_cp_get_buffers( filp, dev, &d );
}
- DRM_COPY_TO_USER_IOCTL(
(drm_dma_t *)data
, d, sizeof(d) );
+ DRM_COPY_TO_USER_IOCTL(
argp
, d, sizeof(d) );
return ret;
}
return ret;
}