summaryrefslogtreecommitdiffstats
path: root/arch/sparc64
diff options
context:
space:
mode:
authorFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2007-10-23 12:58:39 +0200
committerJens Axboe <jens.axboe@oracle.com>2007-10-23 12:58:39 +0200
commitcb92ae81509eb5ddaea53884b60437502c837405 (patch)
tree5a85ce2a035cdb0b9a343dc7e08f23af42f858df /arch/sparc64
parent83fcaf70403ce04c693b52e62c794834b9a86089 (diff)
downloadop-kernel-dev-cb92ae81509eb5ddaea53884b60437502c837405.zip
op-kernel-dev-cb92ae81509eb5ddaea53884b60437502c837405.tar.gz
sparc64: zero out dma_length
zero out dma_length in the entry immediately following the last mapped entry for unmap_sg. Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'arch/sparc64')
-rw-r--r--arch/sparc64/kernel/iommu_common.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/sparc64/kernel/iommu_common.c b/arch/sparc64/kernel/iommu_common.c
index 78e8277..b70324e 100644
--- a/arch/sparc64/kernel/iommu_common.c
+++ b/arch/sparc64/kernel/iommu_common.c
@@ -233,6 +233,11 @@ unsigned long prepare_sg(struct scatterlist *sg, int nents)
dma_sg->dma_address = dent_addr;
dma_sg->dma_length = dent_len;
+ if (dma_sg != sg) {
+ dma_sg = next_sg(dma_sg);
+ dma_sg->dma_length = 0;
+ }
+
return ((unsigned long) dent_addr +
(unsigned long) dent_len +
(IO_PAGE_SIZE - 1UL)) >> IO_PAGE_SHIFT;
OpenPOWER on IntegriCloud