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
/
i830_irq.c
diff --git
a/drivers/char/drm/i830_irq.c
b/drivers/char/drm/i830_irq.c
index
b906708
..
362d66e
100644
(file)
--- a/
drivers/char/drm/i830_irq.c
+++ b/
drivers/char/drm/i830_irq.c
@@
-121,7
+121,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,
/* 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;
{
drm_file_t *priv = filp->private_data;
drm_device_t *dev = priv->dev;
@@
-139,7
+139,7
@@
int i830_irq_emit( struct inode *inode, struct file *filp, unsigned int cmd,
return -EINVAL;
}
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 );
return -EFAULT;
result = i830_emit_irq( dev );
@@
-168,7
+168,7
@@
int i830_irq_wait( struct inode *inode, struct file *filp, unsigned int cmd,
return -EINVAL;
}
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;
sizeof(irqwait) ))
return -EFAULT;