Merge tag 'v3.10.72' into linux-linaro-lsk

[firefly-linux-kernel-4.4.55.git] / mm / memory.c

diff --git a/mm/memory.c b/mm/memory.c
index 1df7bd48cdae095a80d37e8546679e126ff41c54..280930f51ef61877bbabc033b176bc1441b70766 100644 (file)
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -4090,7 +4090,7 @@ int generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
        if (follow_phys(vma, addr, write, &prot, &phys_addr))
                return -EINVAL;
 
-       maddr = ioremap_prot(phys_addr, PAGE_SIZE, prot);
+       maddr = ioremap_prot(phys_addr, PAGE_ALIGN(len + offset), prot);
        if (write)
                memcpy_toio(maddr + offset, buf, len);
        else