From 7d69f8b3c776eca0b70e85c47d3936f8bd740d50 Mon Sep 17 00:00:00 2001
From: Pawel Moll <pawel.moll@arm.com>
Date: Thu, 26 Jan 2012 11:47:11 +0100
Subject: [PATCH] --- yaml --- r: 286914 b: refs/heads/master c:
 3c424f359898aff48c3d5bed608ac706f8a528c3 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/arch/arm/mm/ioremap.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7085f88cf0a9..a3f3b3fc2aaa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a95b9e7416c2e7fa799e54078a1adf84a7ed0bf
+refs/heads/master: 3c424f359898aff48c3d5bed608ac706f8a528c3
diff --git a/trunk/arch/arm/mm/ioremap.c b/trunk/arch/arm/mm/ioremap.c
index 80632e8d7538..ba159370fa5f 100644
--- a/trunk/arch/arm/mm/ioremap.c
+++ b/trunk/arch/arm/mm/ioremap.c
@@ -225,7 +225,8 @@ void __iomem * __arm_ioremap_pfn_caller(unsigned long pfn,
 		if ((area->flags & VM_ARM_MTYPE_MASK) != VM_ARM_MTYPE(mtype))
 			continue;
 		if (__phys_to_pfn(area->phys_addr) > pfn ||
-		    __pfn_to_phys(pfn) + size-1 > area->phys_addr + area->size-1)
+		    __pfn_to_phys(pfn) + offset + size-1 >
+		    area->phys_addr + area->size-1)
 			continue;
 		/* we can drop the lock here as we know *area is static */
 		read_unlock(&vmlist_lock);