commit c924aff853bdc1c9841dd22440f931fba5ab3a59
author Russell King <rmk@dyn-67.arm.linux.org.uk> Sun Dec 17 23:29:57 2006 +0000
committer Russell King <rmk+kernel@arm.linux.org.uk> Sun Dec 17 23:29:57 2006 +0000
tree eaf325f35e46f8d76514fa357326d78590eafd7f
parent 5a059f1ac0ed0c937257027aed5da50241f5ec2b

[ARM] Fix BUG()s in ioremap() code

We need to ensure that the area size is page aligned so that
remap_area_pte() doesn't increment the address past the end of
the desired area.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

arch/arm/mm/ioremap.c

diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c
index 3bb3951..251685f 100644
--- a/arch/arm/mm/ioremap.c
+++ b/arch/arm/mm/ioremap.c
@@ -292,6 +292,8 @@
 	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;