From dd860078684bfb28c6f13fa1403bde657afa1102 Mon Sep 17 00:00:00 2001
From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Sun, 17 Dec 2006 23:29:57 +0000
Subject: [PATCH] --- yaml --- r: 44678 b: refs/heads/master c:
 c924aff853bdc1c9841dd22440f931fba5ab3a59 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index f11ac0dcb1a3..bd4a5bbb5341 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5a059f1ac0ed0c937257027aed5da50241f5ec2b
+refs/heads/master: c924aff853bdc1c9841dd22440f931fba5ab3a59
diff --git a/trunk/arch/arm/mm/ioremap.c b/trunk/arch/arm/mm/ioremap.c
index 3bb3951920bc..251685fe73a8 100644
--- a/trunk/arch/arm/mm/ioremap.c
+++ b/trunk/arch/arm/mm/ioremap.c
@@ -292,6 +292,8 @@ __ioremap_pfn(unsigned long pfn, unsigned long offset, size_t size,
 	if (pfn >= 0x100000 && (__pfn_to_phys(pfn) & ~SUPERSECTION_MASK))
 		return NULL;
 
+	size = PAGE_ALIGN(size);
+
  	area = get_vm_area(size, VM_IOREMAP);
  	if (!area)
  		return NULL;