---

yaml --- r: 356595 b: refs/heads/master c: 4805b02 h: refs/heads/master i: 356593: 62f0c29 356591: 6808835 v: v3
git-mirror · Feb 24, 2013 · 95a5b71 · 95a5b71
1 parent 5e03bf8
commit 95a5b71
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e3790144c9091631a18564aa64db8a971da02c41
+refs/heads/master: 4805b02e90187c68d8f4e3305c3482b797e35809
diff --git a/trunk/mm/mlock.c b/trunk/mm/mlock.c
@@ -185,6 +185,10 @@ long __mlock_vma_pages_range(struct vm_area_struct *vma,
 	if (vma->vm_flags & (VM_READ | VM_WRITE | VM_EXEC))
 		gup_flags |= FOLL_FORCE;
 
+	/*
+	 * We made sure addr is within a VMA, so the following will
+	 * not result in a stack expansion that recurses back here.
+	 */
 	return __get_user_pages(current, mm, addr, nr_pages, gup_flags,
 				NULL, NULL, nonblocking);
 }