diff options
| author | Dave Airlie <airlied@linux.ie> | 2004-07-25 08:47:38 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2004-07-25 08:47:38 +0000 |
| commit | 02df04d71d373f1f779ebfd5d383a704ebb397ee (patch) | |
| tree | 1e58f7bfc78d0c99dc25981603e9fca0ed9a6859 /linux-core/i830_irq.c | |
| parent | 1f132b7849c453d3aebd227866f743cbcf7f3881 (diff) | |
sync up with current 2.6 kernel bk tree - mostly __user annotations
Diffstat (limited to 'linux-core/i830_irq.c')
| -rw-r--r-- | linux-core/i830_irq.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linux-core/i830_irq.c b/linux-core/i830_irq.c index fcf2dedd..7a066b6f 100644 --- a/linux-core/i830_irq.c +++ b/linux-core/i830_irq.c @@ -122,7 +122,7 @@ int i830_wait_irq(drm_device_t *dev, int irq_nr) /* Needs the lock as it touches the ring. */ int i830_irq_emit( struct inode *inode, struct file *filp, unsigned int cmd, - unsigned long __user arg ) + unsigned long arg ) { drm_file_t *priv = filp->private_data; drm_device_t *dev = priv->dev; @@ -140,7 +140,7 @@ int i830_irq_emit( struct inode *inode, struct file *filp, unsigned int cmd, return -EINVAL; } - if (copy_from_user( &emit, (drm_i830_irq_emit_t *)arg, sizeof(emit) )) + if (copy_from_user( &emit, (drm_i830_irq_emit_t __user *)arg, sizeof(emit) )) return -EFAULT; result = i830_emit_irq( dev ); @@ -169,7 +169,7 @@ int i830_irq_wait( struct inode *inode, struct file *filp, unsigned int cmd, return -EINVAL; } - if (copy_from_user( &irqwait, (drm_i830_irq_wait_t *)arg, + if (copy_from_user( &irqwait, (drm_i830_irq_wait_t __user *)arg, sizeof(irqwait) )) return -EFAULT; |