Commit:     c924aff853bdc1c9841dd22440f931fba5ab3a59
Parent:     5a059f1ac0ed0c937257027aed5da50241f5ec2b
Author:     Russell King <[EMAIL PROTECTED]>
AuthorDate: Sun Dec 17 23:29:57 2006 +0000
Committer:  Russell King <[EMAIL PROTECTED]>
CommitDate: Sun Dec 17 23:29:57 2006 +0000

    [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 <[EMAIL PROTECTED]>
 arch/arm/mm/ioremap.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

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 @@ __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;
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to