commit 900469d0b0c337db19908f77d172f4b17f4573ba
author José Adolfo Galdámez <josegalre@pac-rom.com> Sat Jun 20 23:45:36 2015 -0600
committer William Bellavance <flintman@flintmancomputers.com> Wed Feb 10 20:02:51 2016 -0500
tree e7c8e6e70ad09ecc74c7385269f9a7a908489b88
parent 3591a444f6b8cb82a9b88a49a4e67d8f4b61a6de

Merge tag 'v3.4.108' into mm-6.0

Change-Id: I5ee718e5c87c9647c6edf0926a887679e065a649
Signed-off-by: José Adolfo Galdámez <josegalre@pac-rom.com>

mm/memory.c

diff --git a/mm/memory.c b/mm/memory.c
index 0e4c5fe..7c35fa7 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -3873,7 +3873,7 @@
 	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