From f2cb32875c2218c8df75d3fc50300a9570fb4bb1 Mon Sep 17 00:00:00 2001
From: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
Date: Mon, 15 Feb 2010 10:03:32 -0800
Subject: [PATCH] --- yaml --- r: 184695 b: refs/heads/master c:
 8d33ea5881bce56f85de7fcc90e1c5618fa5b62d h: refs/heads/master i:   184693:
 eef60f487c109cb9d5646c91146f6d5dd8e1cf15   184691:
 cf66614a78ce6613f10f1eb39668e21e2769fa43   184687:
 ec5022ae2ac30bb67bce1794cd8040f16e366ae6 v: v3

---
 [refs]                           | 2 +-
 trunk/arch/arm/plat-omap/iommu.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9cdae6b07035..bc45aadfd0e2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 97ec7d585b33bbcc2be92dafa05b540959b4ea47
+refs/heads/master: 8d33ea5881bce56f85de7fcc90e1c5618fa5b62d
diff --git a/trunk/arch/arm/plat-omap/iommu.c b/trunk/arch/arm/plat-omap/iommu.c
index 463d6386aff2..e74811920668 100644
--- a/trunk/arch/arm/plat-omap/iommu.c
+++ b/trunk/arch/arm/plat-omap/iommu.c
@@ -667,7 +667,7 @@ static size_t iopgtable_clear_entry_core(struct iommu *obj, u32 da)
 		if ((*iopgd & IOPGD_SUPER) == IOPGD_SUPER) {
 			nent *= 16;
 			/* rewind to the 1st entry */
-			iopgd = (u32 *)((u32)iopgd & IOSUPER_MASK);
+			iopgd = iopgd_offset(obj, (da & IOSUPER_MASK));
 		}
 		bytes *= nent;
 	}