diff --git a/[refs] b/[refs]
index 4527fd851c63..9a9175ff8973 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f047f4f3792344901e1ea18a180515d7d5349e02
+refs/heads/master: c08c6e1f54c85fc299cf9f88cf330d6dd28a9a1d
diff --git a/trunk/mm/nommu.c b/trunk/mm/nommu.c
index 55727a74af98..b9b5cceb1b68 100644
--- a/trunk/mm/nommu.c
+++ b/trunk/mm/nommu.c
@@ -146,7 +146,7 @@ int __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
 			(VM_MAYREAD | VM_MAYWRITE) : (VM_READ | VM_WRITE);
 
 	for (i = 0; i < nr_pages; i++) {
-		vma = find_vma(mm, start);
+		vma = find_extend_vma(mm, start);
 		if (!vma)
 			goto finish_or_fault;
 
@@ -764,7 +764,7 @@ EXPORT_SYMBOL(find_vma);
  */
 struct vm_area_struct *find_extend_vma(struct mm_struct *mm, unsigned long addr)
 {
-	return find_vma(mm, addr);
+	return find_vma(mm, addr & PAGE_MASK);
 }
 
 /*