aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/parisc/ccio-dma.c
diff options
context:
space:
mode:
authorFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2008-03-04 17:29:28 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-03-04 19:35:17 -0500
commit7c8cda625acd9b704100994626fb6d2fb4ffb9c2 (patch)
treef938f445d90db32a634102aabd47521bc00d3d6a /drivers/parisc/ccio-dma.c
parent3715863aa142c4f4c5208f5f3e5e9bac06006d2f (diff)
iommu: parisc: pass struct device to iommu_alloc_range
This adds struct device argument to sba_alloc_range and ccio_alloc_range, a preparation for modifications to fix the IOMMU segment boundary problem. This change enables ccio_alloc_range to access to LLD's segment boundary limits. [akpm@linux-foundation.org: coding-style fixes] Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Cc: Kyle McMartin <kyle@parisc-linux.org> Cc: Matthew Wilcox <matthew@wil.cx> Cc: Grant Grundler <grundler@parisc-linux.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/parisc/ccio-dma.c')
-rw-r--r--drivers/parisc/ccio-dma.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/parisc/ccio-dma.c b/drivers/parisc/ccio-dma.c
index d08b284de196..1695facfca3a 100644
--- a/drivers/parisc/ccio-dma.c
+++ b/drivers/parisc/ccio-dma.c
@@ -341,7 +341,7 @@ static int ioc_count;
341 * of available pages for the requested size. 341 * of available pages for the requested size.
342 */ 342 */
343static int 343static int
344ccio_alloc_range(struct ioc *ioc, size_t size) 344ccio_alloc_range(struct ioc *ioc, struct device *dev, size_t size)
345{ 345{
346 unsigned int pages_needed = size >> IOVP_SHIFT; 346 unsigned int pages_needed = size >> IOVP_SHIFT;
347 unsigned int res_idx; 347 unsigned int res_idx;
@@ -760,7 +760,7 @@ ccio_map_single(struct device *dev, void *addr, size_t size,
760 ioc->msingle_pages += size >> IOVP_SHIFT; 760 ioc->msingle_pages += size >> IOVP_SHIFT;
761#endif 761#endif
762 762
763 idx = ccio_alloc_range(ioc, size); 763 idx = ccio_alloc_range(ioc, dev, size);
764 iovp = (dma_addr_t)MKIOVP(idx); 764 iovp = (dma_addr_t)MKIOVP(idx);
765 765
766 pdir_start = &(ioc->pdir_base[idx]); 766 pdir_start = &(ioc->pdir_base[idx]);