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
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
drivers
/
char
/
drm
/
sis_mm.c
diff --git
a/drivers/char/drm/sis_mm.c
b/drivers/char/drm/sis_mm.c
index
5d29b40
..
9a10785
100644
(file)
--- a/
drivers/char/drm/sis_mm.c
+++ b/
drivers/char/drm/sis_mm.c
@@
-155,7
+155,7
@@
int sis_fb_init( DRM_IOCTL_ARGS )
drm_sis_private_t *dev_priv = dev->dev_private;
drm_sis_fb_t fb;
drm_sis_private_t *dev_priv = dev->dev_private;
drm_sis_fb_t fb;
- DRM_COPY_FROM_USER_IOCTL(fb, (drm_sis_fb_t
__user
*)data, sizeof(fb));
+ DRM_COPY_FROM_USER_IOCTL(fb, (drm_sis_fb_t *)data, sizeof(fb));
if (dev_priv == NULL) {
dev->dev_private = DRM(calloc)(1, sizeof(drm_sis_private_t),
if (dev_priv == NULL) {
dev->dev_private = DRM(calloc)(1, sizeof(drm_sis_private_t),
@@
-179,7
+179,6
@@
int sis_fb_alloc( DRM_IOCTL_ARGS )
{
DRM_DEVICE;
drm_sis_private_t *dev_priv = dev->dev_private;
{
DRM_DEVICE;
drm_sis_private_t *dev_priv = dev->dev_private;
- drm_sis_mem_t __user *argp = (void __user *)data;
drm_sis_mem_t fb;
PMemBlock block;
int retval = 0;
drm_sis_mem_t fb;
PMemBlock block;
int retval = 0;
@@
-187,7
+186,7
@@
int sis_fb_alloc( DRM_IOCTL_ARGS )
if (dev_priv == NULL || dev_priv->FBHeap == NULL)
return DRM_ERR(EINVAL);
if (dev_priv == NULL || dev_priv->FBHeap == NULL)
return DRM_ERR(EINVAL);
- DRM_COPY_FROM_USER_IOCTL(fb,
argp
, sizeof(fb));
+ DRM_COPY_FROM_USER_IOCTL(fb,
(drm_sis_mem_t *)data
, sizeof(fb));
block = mmAllocMem(dev_priv->FBHeap, fb.size, 0, 0);
if (block) {
block = mmAllocMem(dev_priv->FBHeap, fb.size, 0, 0);
if (block) {
@@
-205,7
+204,7
@@
int sis_fb_alloc( DRM_IOCTL_ARGS )
fb.free = 0;
}
fb.free = 0;
}
- DRM_COPY_TO_USER_IOCTL(
argp
, fb, sizeof(fb));
+ DRM_COPY_TO_USER_IOCTL(
(drm_sis_mem_t *)data
, fb, sizeof(fb));
DRM_DEBUG("alloc fb, size = %d, offset = %d\n", fb.size, fb.offset);
DRM_DEBUG("alloc fb, size = %d, offset = %d\n", fb.size, fb.offset);
@@
-221,7
+220,7
@@
int sis_fb_free( DRM_IOCTL_ARGS )
if (dev_priv == NULL || dev_priv->FBHeap == NULL)
return DRM_ERR(EINVAL);
if (dev_priv == NULL || dev_priv->FBHeap == NULL)
return DRM_ERR(EINVAL);
- DRM_COPY_FROM_USER_IOCTL(fb, (drm_sis_mem_t
__user
*)data, sizeof(fb));
+ DRM_COPY_FROM_USER_IOCTL(fb, (drm_sis_mem_t *)data, sizeof(fb));
if (!mmBlockInHeap(dev_priv->FBHeap, (PMemBlock)fb.free))
return DRM_ERR(EINVAL);
if (!mmBlockInHeap(dev_priv->FBHeap, (PMemBlock)fb.free))
return DRM_ERR(EINVAL);
@@
-256,7
+255,7
@@
int sis_ioctl_agp_init( DRM_IOCTL_ARGS )
if (dev_priv->AGPHeap != NULL)
return DRM_ERR(EINVAL);
if (dev_priv->AGPHeap != NULL)
return DRM_ERR(EINVAL);
- DRM_COPY_FROM_USER_IOCTL(agp, (drm_sis_agp_t
__user
*)data, sizeof(agp));
+ DRM_COPY_FROM_USER_IOCTL(agp, (drm_sis_agp_t *)data, sizeof(agp));
dev_priv->AGPHeap = mmInit(agp.offset, agp.size);
dev_priv->AGPHeap = mmInit(agp.offset, agp.size);
@@
-269,7
+268,6
@@
int sis_ioctl_agp_alloc( DRM_IOCTL_ARGS )
{
DRM_DEVICE;
drm_sis_private_t *dev_priv = dev->dev_private;
{
DRM_DEVICE;
drm_sis_private_t *dev_priv = dev->dev_private;
- drm_sis_mem_t __user *argp = (void __user *)data;
drm_sis_mem_t agp;
PMemBlock block;
int retval = 0;
drm_sis_mem_t agp;
PMemBlock block;
int retval = 0;
@@
-277,7
+275,7
@@
int sis_ioctl_agp_alloc( DRM_IOCTL_ARGS )
if (dev_priv == NULL || dev_priv->AGPHeap == NULL)
return DRM_ERR(EINVAL);
if (dev_priv == NULL || dev_priv->AGPHeap == NULL)
return DRM_ERR(EINVAL);
- DRM_COPY_FROM_USER_IOCTL(agp,
argp
, sizeof(agp));
+ DRM_COPY_FROM_USER_IOCTL(agp,
(drm_sis_mem_t *)data
, sizeof(agp));
block = mmAllocMem(dev_priv->AGPHeap, agp.size, 0, 0);
if (block) {
block = mmAllocMem(dev_priv->AGPHeap, agp.size, 0, 0);
if (block) {
@@
-295,7
+293,7
@@
int sis_ioctl_agp_alloc( DRM_IOCTL_ARGS )
agp.free = 0;
}
agp.free = 0;
}
- DRM_COPY_TO_USER_IOCTL(
argp
, agp, sizeof(agp));
+ DRM_COPY_TO_USER_IOCTL(
(drm_sis_mem_t *)data
, agp, sizeof(agp));
DRM_DEBUG("alloc agp, size = %d, offset = %d\n", agp.size, agp.offset);
DRM_DEBUG("alloc agp, size = %d, offset = %d\n", agp.size, agp.offset);
@@
-311,7
+309,7
@@
int sis_ioctl_agp_free( DRM_IOCTL_ARGS )
if (dev_priv == NULL || dev_priv->AGPHeap == NULL)
return DRM_ERR(EINVAL);
if (dev_priv == NULL || dev_priv->AGPHeap == NULL)
return DRM_ERR(EINVAL);
- DRM_COPY_FROM_USER_IOCTL(agp, (drm_sis_mem_t
__user
*)data, sizeof(agp));
+ DRM_COPY_FROM_USER_IOCTL(agp, (drm_sis_mem_t *)data, sizeof(agp));
if (!mmBlockInHeap(dev_priv->AGPHeap, (PMemBlock)agp.free))
return DRM_ERR(EINVAL);
if (!mmBlockInHeap(dev_priv->AGPHeap, (PMemBlock)agp.free))
return DRM_ERR(EINVAL);