diff --git a/[refs] b/[refs]
index d8a191127bfc..4990147dc5e1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1e8a81c5a37907bc082025d3468718116dca1eeb
+refs/heads/master: 2d15cab85b85a56cc886037cab43cc292923ff22
diff --git a/trunk/mm/memory.c b/trunk/mm/memory.c
index c256175742ac..beabdefa6254 100644
--- a/trunk/mm/memory.c
+++ b/trunk/mm/memory.c
@@ -1139,7 +1139,7 @@ int remap_pfn_range(struct vm_area_struct *vma, unsigned long addr,
 {
 	pgd_t *pgd;
 	unsigned long next;
-	unsigned long end = addr + size;
+	unsigned long end = addr + PAGE_ALIGN(size);
 	struct mm_struct *mm = vma->vm_mm;
 	int err;