From 474ba85b58e6d2d820c6413ddd8a6776cf181a27 Mon Sep 17 00:00:00 2001 From: FUJITA Tomonori Date: Tue, 23 Oct 2007 12:58:39 +0200 Subject: [PATCH] --- yaml --- r: 72199 b: refs/heads/master c: cb92ae81509eb5ddaea53884b60437502c837405 h: refs/heads/master i: 72197: a0e2261e2a0ee2507da34c4d13577d6d3c5b00f7 72195: fe9cfc3177b9cef862550fd5d93f3a9970ddb860 72191: 8b96984f16dd824f7e42e57762bd246194a62c2b v: v3 --- [refs] | 2 +- trunk/arch/sparc64/kernel/iommu_common.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 45bea16e8b01..5da8c56d30f5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 83fcaf70403ce04c693b52e62c794834b9a86089 +refs/heads/master: cb92ae81509eb5ddaea53884b60437502c837405 diff --git a/trunk/arch/sparc64/kernel/iommu_common.c b/trunk/arch/sparc64/kernel/iommu_common.c index 78e8277df655..b70324e0d83d 100644 --- a/trunk/arch/sparc64/kernel/iommu_common.c +++ b/trunk/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;