From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Date: Thu, 21 Feb 2008 06:56:42 +0000 (-0800)
Subject: [SPARC64]: make IOMMU code respect the segment boundary limits
X-Git-Tag: v2.6.25-rc3~10^2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=89c94f2f70d093f59b55d3ea8042d13889169346;p=linux-2.6-omap-h63xx.git

[SPARC64]: make IOMMU code respect the segment boundary limits

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/arch/sparc64/kernel/iommu.c b/arch/sparc64/kernel/iommu.c
index 0e347ff812a..fbaab3497bf 100644
--- a/arch/sparc64/kernel/iommu.c
+++ b/arch/sparc64/kernel/iommu.c
@@ -134,7 +134,8 @@ unsigned long iommu_range_alloc(struct device *dev,
 	else
 		boundary_size = ALIGN(1UL << 32, 1 << IO_PAGE_SHIFT);
 
-	n = iommu_area_alloc(arena->map, limit, start, npages, 0,
+	n = iommu_area_alloc(arena->map, limit, start, npages,
+			     iommu->page_table_map_base >> IO_PAGE_SHIFT,
 			     boundary_size >> IO_PAGE_SHIFT, 0);
 	if (n == -1) {
 		if (likely(pass < 1)) {