From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Date: Tue, 23 Oct 2007 10:58:39 +0000 (+0200)
Subject: sparc64: zero out dma_length
X-Git-Tag: v2.6.24-rc1~34^2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=cb92ae81509eb5ddaea53884b60437502c837405;p=linux-2.6-omap-h63xx.git

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>
---

diff --git a/arch/sparc64/kernel/iommu_common.c b/arch/sparc64/kernel/iommu_common.c
index 78e8277df65..b70324e0d83 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;