From 608c8abbcab8b7c97053e77a838cb25a52e6776d Mon Sep 17 00:00:00 2001
From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Wed, 4 Jul 2007 21:16:33 +0100
Subject: [PATCH] --- yaml --- r: 58217 b: refs/heads/master c:
 7b9c7b4d07fd8981193a2c4ecb650566f42d1219 h: refs/heads/master i:   58215:
 a82a8b319c1f19bf0740ddbd54ad3e64ec7c1442 v: v3

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

diff --git a/[refs] b/[refs]
index b9b7cd9b5c3c..a498540de680 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f750a782c0e9593a8d0981ea972f22334980955
+refs/heads/master: 7b9c7b4d07fd8981193a2c4ecb650566f42d1219
diff --git a/trunk/arch/arm/mm/mmu.c b/trunk/arch/arm/mm/mmu.c
index 02e050ae59f6..3b5e47dc0c97 100644
--- a/trunk/arch/arm/mm/mmu.c
+++ b/trunk/arch/arm/mm/mmu.c
@@ -527,9 +527,9 @@ void __init create_mapping(struct map_desc *md)
 		return;
 	}
 
-	addr = md->virtual;
+	addr = md->virtual & PAGE_MASK;
 	phys = (unsigned long)__pfn_to_phys(md->pfn);
-	length = PAGE_ALIGN(md->length);
+	length = PAGE_ALIGN(md->length + (md->virtual & ~PAGE_MASK));
 
 	if (type->prot_l1 == 0 && ((addr | phys | length) & ~SECTION_MASK)) {
 		printk(KERN_WARNING "BUG: map for 0x%08lx at 0x%08lx can not "