diff options
| author | FUJITA Tomonori <tomof@acm.org> | 2008-02-05 01:27:57 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-05 12:44:10 -0500 |
| commit | 740c3ce66700640a6e6136ff679b067e92125794 (patch) | |
| tree | 720f3d4c847e4576ed8a5df325d12701adde6616 /include/asm-powerpc/iommu.h | |
| parent | 42d00284e16bf998f8f93ce5d061df81b0ff283e (diff) | |
iommu sg merging: ppc: 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: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/asm-powerpc/iommu.h')
| -rw-r--r-- | include/asm-powerpc/iommu.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-powerpc/iommu.h b/include/asm-powerpc/iommu.h index 7a3cef785abd..a07a67c80c1f 100644 --- a/include/asm-powerpc/iommu.h +++ b/include/asm-powerpc/iommu.h | |||
| @@ -79,7 +79,7 @@ extern void iommu_free_table(struct iommu_table *tbl, const char *node_name); | |||
| 79 | extern struct iommu_table *iommu_init_table(struct iommu_table * tbl, | 79 | extern struct iommu_table *iommu_init_table(struct iommu_table * tbl, |
| 80 | int nid); | 80 | int nid); |
| 81 | 81 | ||
| 82 | extern int iommu_map_sg(struct iommu_table *tbl, struct scatterlist *sglist, | 82 | extern int iommu_map_sg(struct device *dev, struct scatterlist *sglist, |
| 83 | int nelems, unsigned long mask, | 83 | int nelems, unsigned long mask, |
| 84 | enum dma_data_direction direction); | 84 | enum dma_data_direction direction); |
| 85 | extern void iommu_unmap_sg(struct iommu_table *tbl, struct scatterlist *sglist, | 85 | extern void iommu_unmap_sg(struct iommu_table *tbl, struct scatterlist *sglist, |