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
/
drm_irq.h
diff --git
a/drivers/char/drm/drm_irq.h
b/drivers/char/drm/drm_irq.h
index
1d1d951
..
04bb0ac
100644
(file)
--- a/
drivers/char/drm/drm_irq.h
+++ b/
drivers/char/drm/drm_irq.h
@@
-65,9
+65,10
@@
int DRM(irq_by_busid)(struct inode *inode, struct file *filp,
{
drm_file_t *priv = filp->private_data;
drm_device_t *dev = priv->dev;
{
drm_file_t *priv = filp->private_data;
drm_device_t *dev = priv->dev;
+ drm_irq_busid_t __user *argp = (void __user *)arg;
drm_irq_busid_t p;
drm_irq_busid_t p;
- if (copy_from_user(&p,
(drm_irq_busid_t *)arg
, sizeof(p)))
+ if (copy_from_user(&p,
argp
, sizeof(p)))
return -EFAULT;
if ((p.busnum >> 8) != dev->pci_domain ||
return -EFAULT;
if ((p.busnum >> 8) != dev->pci_domain ||
@@
-80,7
+81,7
@@
int DRM(irq_by_busid)(struct inode *inode, struct file *filp,
DRM_DEBUG("%d:%d:%d => IRQ %d\n",
p.busnum, p.devnum, p.funcnum, p.irq);
DRM_DEBUG("%d:%d:%d => IRQ %d\n",
p.busnum, p.devnum, p.funcnum, p.irq);
- if (copy_to_user(
(drm_irq_busid_t *)arg
, &p, sizeof(p)))
+ if (copy_to_user(
argp
, &p, sizeof(p)))
return -EFAULT;
return 0;
}
return -EFAULT;
return 0;
}
@@
-127,11
+128,11
@@
int DRM(irq_install)( drm_device_t *dev )
dev->dma->this_buffer = NULL;
#endif
dev->dma->this_buffer = NULL;
#endif
-#if __HAVE_IRQ_BH
+#if
def
__HAVE_IRQ_BH
INIT_WORK(&dev->work, DRM(irq_immediate_bh), dev);
#endif
INIT_WORK(&dev->work, DRM(irq_immediate_bh), dev);
#endif
-#if __HAVE_VBL_IRQ
+#if
def
__HAVE_VBL_IRQ
init_waitqueue_head(&dev->vbl_queue);
spin_lock_init( &dev->vbl_lock );
init_waitqueue_head(&dev->vbl_queue);
spin_lock_init( &dev->vbl_lock );
@@
-206,7
+207,7
@@
int DRM(control)( struct inode *inode, struct file *filp,
drm_device_t *dev = priv->dev;
drm_control_t ctl;
drm_device_t *dev = priv->dev;
drm_control_t ctl;
- if ( copy_from_user( &ctl, (drm_control_t *)arg, sizeof(ctl) ) )
+ if ( copy_from_user( &ctl, (drm_control_t
__user
*)arg, sizeof(ctl) ) )
return -EFAULT;
switch ( ctl.func ) {
return -EFAULT;
switch ( ctl.func ) {
@@
-222,7
+223,7
@@
int DRM(control)( struct inode *inode, struct file *filp,
}
}
}
}
-#if __HAVE_VBL_IRQ
+#if
def
__HAVE_VBL_IRQ
/**
* Wait for VBLANK.
/**
* Wait for VBLANK.
@@
-247,6
+248,7
@@
int DRM(wait_vblank)( DRM_IOCTL_ARGS )
{
drm_file_t *priv = filp->private_data;
drm_device_t *dev = priv->dev;
{
drm_file_t *priv = filp->private_data;
drm_device_t *dev = priv->dev;
+ drm_wait_vblank_t __user *argp = (void __user *)data;
drm_wait_vblank_t vblwait;
struct timeval now;
int ret = 0;
drm_wait_vblank_t vblwait;
struct timeval now;
int ret = 0;
@@
-255,8
+257,7
@@
int DRM(wait_vblank)( DRM_IOCTL_ARGS )
if (!dev->irq)
return -EINVAL;
if (!dev->irq)
return -EINVAL;
- DRM_COPY_FROM_USER_IOCTL( vblwait, (drm_wait_vblank_t *)data,
- sizeof(vblwait) );
+ DRM_COPY_FROM_USER_IOCTL( vblwait, argp, sizeof(vblwait) );
switch ( vblwait.request.type & ~_DRM_VBLANK_FLAGS_MASK ) {
case _DRM_VBLANK_RELATIVE:
switch ( vblwait.request.type & ~_DRM_VBLANK_FLAGS_MASK ) {
case _DRM_VBLANK_RELATIVE:
@@
-325,8
+326,7
@@
int DRM(wait_vblank)( DRM_IOCTL_ARGS )
}
done:
}
done:
- DRM_COPY_TO_USER_IOCTL( (drm_wait_vblank_t *)data, vblwait,
- sizeof(vblwait) );
+ DRM_COPY_TO_USER_IOCTL( argp, vblwait, sizeof(vblwait) );
return ret;
}
return ret;
}