aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc/kernel/ioport.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-08-27 21:40:38 -0400
committerDavid S. Miller <davem@davemloft.net>2008-08-29 05:15:07 -0400
commit4b1c5df2af38b2681b7c1a058534d17c54aaf6cf (patch)
tree3fd9131a506185fa942865cc5e54ecf274a3b5fb /arch/sparc/kernel/ioport.c
parentb1387c35bef6da55f6f2c27dfb748c86a4ef7ef9 (diff)
sparc32: Make mmu_map_dma_area and mmu_unmap_dma_area take a device pointer.
This lets us kill this "map it in every IOMMU" crazy code, and also some of the final references to sbus_root. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/kernel/ioport.c')
-rw-r--r--arch/sparc/kernel/ioport.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/kernel/ioport.c b/arch/sparc/kernel/ioport.c
index 82ef20161910..d65fb9b06688 100644
--- a/arch/sparc/kernel/ioport.c
+++ b/arch/sparc/kernel/ioport.c
@@ -339,7 +339,7 @@ void *sbus_alloc_consistent(struct device *dev, long len, u32 *dma_addrp)
339 * XXX That's where sdev would be used. Currently we load 339 * XXX That's where sdev would be used. Currently we load
340 * all iommu tables with the same translations. 340 * all iommu tables with the same translations.
341 */ 341 */
342 if (mmu_map_dma_area(dma_addrp, va, res->start, len_total) != 0) 342 if (mmu_map_dma_area(dev, dma_addrp, va, res->start, len_total) != 0)
343 goto err_noiommu; 343 goto err_noiommu;
344 344
345 res->name = op->node->name; 345 res->name = op->node->name;
@@ -384,7 +384,7 @@ void sbus_free_consistent(struct device *dev, long n, void *p, u32 ba)
384 384
385 /* mmu_inval_dma_area(va, n); */ /* it's consistent, isn't it */ 385 /* mmu_inval_dma_area(va, n); */ /* it's consistent, isn't it */
386 pgv = virt_to_page(p); 386 pgv = virt_to_page(p);
387 mmu_unmap_dma_area(ba, n); 387 mmu_unmap_dma_area(dev, ba, n);
388 388
389 __free_pages(pgv, get_order(n)); 389 __free_pages(pgv, get_order(n));
390} 390}