diff options
author | FUJITA Tomonori <tomof@acm.org> | 2008-02-05 01:28:03 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-05 12:44:10 -0500 |
commit | d1b5163206769aa93271bc1029e877ea9f920a5d (patch) | |
tree | 436b2d39dba80d28b0ec3a6f602c813cf0ec4fe0 /drivers/parisc/ccio-dma.c | |
parent | fde6a3c82d67f592eb587be4d12222b0ae6d4321 (diff) |
iommu sg merging: parisc: make iommu respect the segment size limits
This patch makes iommu respect segment size limits when merging sg
lists.
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: Jeff Garzik <jeff@garzik.org>
Cc: James Bottomley <James.Bottomley@steeleye.com>
Acked-by: Jens Axboe <jens.axboe@oracle.com>
Cc: Kyle McMartin <kyle@mcmartin.ca>
Acked-by: Grant Grundler <grundler@parisc-linux.org>
Cc: Matthew Wilcox <willy@debian.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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/parisc/ccio-dma.c b/drivers/parisc/ccio-dma.c index ca52307b8f40..d08b284de196 100644 --- a/drivers/parisc/ccio-dma.c +++ b/drivers/parisc/ccio-dma.c | |||
@@ -941,7 +941,7 @@ ccio_map_sg(struct device *dev, struct scatterlist *sglist, int nents, | |||
941 | ** w/o this association, we wouldn't have coherent DMA! | 941 | ** w/o this association, we wouldn't have coherent DMA! |
942 | ** Access to the virtual address is what forces a two pass algorithm. | 942 | ** Access to the virtual address is what forces a two pass algorithm. |
943 | */ | 943 | */ |
944 | coalesced = iommu_coalesce_chunks(ioc, sglist, nents, ccio_alloc_range); | 944 | coalesced = iommu_coalesce_chunks(ioc, dev, sglist, nents, ccio_alloc_range); |
945 | 945 | ||
946 | /* | 946 | /* |
947 | ** Program the I/O Pdir | 947 | ** Program the I/O Pdir |