diff options
| author | Rik Faith <faith@alephnull.com> | 2001-01-04 18:41:41 +0000 |
|---|---|---|
| committer | Rik Faith <faith@alephnull.com> | 2001-01-04 18:41:41 +0000 |
| commit | 833af23c5d21b1ab139327861d25d96dcd91af6f (patch) | |
| tree | 84064ba2e7f846d3889e3ac3e0a9a9e079e628bd /linux/mga_dma.c | |
| parent | c7c6156aecdee2838dd0e193a3d529ecbb797ae7 (diff) | |
Sync with Linux 2.4.0-prerelease
Diffstat (limited to 'linux/mga_dma.c')
| -rw-r--r-- | linux/mga_dma.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linux/mga_dma.c b/linux/mga_dma.c index 6adffb8a..356376ca 100644 --- a/linux/mga_dma.c +++ b/linux/mga_dma.c @@ -143,7 +143,7 @@ static inline void mga_dma_quiescent(drm_device_t *dev) unsigned long end; int i; - DRM_DEBUG("dispatch_status = 0x%02x\n", dev_priv->dispatch_status); + DRM_DEBUG("dispatch_status = 0x%02lx\n", dev_priv->dispatch_status); end = jiffies + (HZ*3); while(1) { if(!test_and_set_bit(MGA_IN_DISPATCH, @@ -154,7 +154,7 @@ static inline void mga_dma_quiescent(drm_device_t *dev) DRM_ERROR("irqs: %d wanted %d\n", atomic_read(&dev->total_irq), atomic_read(&dma->total_lost)); - DRM_ERROR("lockup: dispatch_status = 0x%02x," + DRM_ERROR("lockup: dispatch_status = 0x%02lx," " jiffies = %lu, end = %lu\n", dev_priv->dispatch_status, jiffies, end); return; @@ -177,7 +177,7 @@ static inline void mga_dma_quiescent(drm_device_t *dev) sarea_priv->dirty |= MGA_DMA_FLUSH; clear_bit(MGA_IN_DISPATCH, &dev_priv->dispatch_status); - DRM_DEBUG("exit, dispatch_status = 0x%02x\n", + DRM_DEBUG("exit, dispatch_status = 0x%02lx\n", dev_priv->dispatch_status); } @@ -818,7 +818,7 @@ int mga_irq_install(drm_device_t *dev, int irq) dev->dma->next_buffer = NULL; dev->dma->next_queue = NULL; dev->dma->this_buffer = NULL; - dev->tq.next = NULL; + INIT_LIST_HEAD(&dev->tq.list); dev->tq.sync = 0; dev->tq.routine = mga_dma_task_queue; dev->tq.data = dev; |