---

yaml --- r: 186223 b: refs/heads/master c: c08c6e1 h: refs/heads/master i: 186221: 5d23368 186219: 18bbb59 186215: 070807d 186207: efec01c v: v3
git-mirror · Mar 6, 2010 · 6834054 · 6834054
1 parent 1589488
commit 6834054
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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);
 }
 
 /*