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.3
[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
362d66e
..
6a0e25c
100644
(file)
--- a/
drivers/char/drm/i830_irq.c
+++ b/
drivers/char/drm/i830_irq.c
@@
-35,7
+35,7
@@
#include <linux/delay.h>
#include <linux/delay.h>
-irqreturn_t
DRM(irq_handler)
( DRM_IRQ_ARGS )
+irqreturn_t
i830_driver_irq_handler
( DRM_IRQ_ARGS )
{
drm_device_t *dev = (drm_device_t *)arg;
drm_i830_private_t *dev_priv = (drm_i830_private_t *)dev->dev_private;
{
drm_device_t *dev = (drm_device_t *)arg;
drm_i830_private_t *dev_priv = (drm_i830_private_t *)dev->dev_private;
@@
-92,7
+92,7
@@
int i830_wait_irq(drm_device_t *dev, int irq_nr)
add_wait_queue(&dev_priv->irq_queue, &entry);
for (;;) {
add_wait_queue(&dev_priv->irq_queue, &entry);
for (;;) {
-
current->state = TASK_INTERRUPTIBLE
;
+
__set_current_state(TASK_INTERRUPTIBLE)
;
if (atomic_read(&dev_priv->irq_received) >= irq_nr)
break;
if((signed)(end - jiffies) <= 0) {
if (atomic_read(&dev_priv->irq_received) >= irq_nr)
break;
if((signed)(end - jiffies) <= 0) {
@@
-112,7
+112,7
@@
int i830_wait_irq(drm_device_t *dev, int irq_nr)
}
}
}
}
-
current->state = TASK_RUNNING
;
+
__set_current_state(TASK_RUNNING)
;
remove_wait_queue(&dev_priv->irq_queue, &entry);
return ret;
}
remove_wait_queue(&dev_priv->irq_queue, &entry);
return ret;
}
@@
-178,7
+178,7
@@
int i830_irq_wait( struct inode *inode, struct file *filp, unsigned int cmd,
/* drm_dma.h hooks
*/
/* drm_dma.h hooks
*/
-void
DRM(driver_irq_preinstall)
( drm_device_t *dev ) {
+void
i830_driver_irq_preinstall
( drm_device_t *dev ) {
drm_i830_private_t *dev_priv =
(drm_i830_private_t *)dev->dev_private;
drm_i830_private_t *dev_priv =
(drm_i830_private_t *)dev->dev_private;
@@
-190,14
+190,14
@@
void DRM(driver_irq_preinstall)( drm_device_t *dev ) {
init_waitqueue_head(&dev_priv->irq_queue);
}
init_waitqueue_head(&dev_priv->irq_queue);
}
-void
DRM(driver_irq_postinstall)
( drm_device_t *dev ) {
+void
i830_driver_irq_postinstall
( drm_device_t *dev ) {
drm_i830_private_t *dev_priv =
(drm_i830_private_t *)dev->dev_private;
I830_WRITE16( I830REG_INT_ENABLE_R, 0x2 );
}
drm_i830_private_t *dev_priv =
(drm_i830_private_t *)dev->dev_private;
I830_WRITE16( I830REG_INT_ENABLE_R, 0x2 );
}
-void
DRM(driver_irq_uninstall)
( drm_device_t *dev ) {
+void
i830_driver_irq_uninstall
( drm_device_t *dev ) {
drm_i830_private_t *dev_priv =
(drm_i830_private_t *)dev->dev_private;
if (!dev_priv)
drm_i830_private_t *dev_priv =
(drm_i830_private_t *)dev->dev_private;
if (!dev_priv)