diff options
| author | David S. Miller <davem@davemloft.net> | 2008-08-28 03:40:38 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-08-29 11:15:07 +0200 |
| commit | 4b1c5df2af38b2681b7c1a058534d17c54aaf6cf (patch) | |
| tree | 3fd9131a506185fa942865cc5e54ecf274a3b5fb /arch/sparc/kernel/ioport.c | |
| parent | sparc32: Kill mmu_translate_dvma and implementations. (diff) | |
| download | linux-4b1c5df2af38b2681b7c1a058534d17c54aaf6cf.tar.xz linux-4b1c5df2af38b2681b7c1a058534d17c54aaf6cf.zip | |
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.c | 4 |
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) * XXX That's where sdev would be used. Currently we load * all iommu tables with the same translations. */ - if (mmu_map_dma_area(dma_addrp, va, res->start, len_total) != 0) + if (mmu_map_dma_area(dev, dma_addrp, va, res->start, len_total) != 0) goto err_noiommu; res->name = op->node->name; @@ -384,7 +384,7 @@ void sbus_free_consistent(struct device *dev, long n, void *p, u32 ba) /* mmu_inval_dma_area(va, n); */ /* it's consistent, isn't it */ pgv = virt_to_page(p); - mmu_unmap_dma_area(ba, n); + mmu_unmap_dma_area(dev, ba, n); __free_pages(pgv, get_order(n)); } |