---

yaml --- r: 131126 b: refs/heads/master c: d5b5623 h: refs/heads/master v: v3
git-mirror · Feb 8, 2009 · 5c87853 · 5c87853
1 parent fd48acf
commit 5c87853
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e4921515c1a379539607eb443d51c30f4f7f338
+refs/heads/master: d5b562330ec766292a3ac54ae5e0673610bd5b3d
diff --git a/trunk/mm/mlock.c b/trunk/mm/mlock.c
@@ -311,7 +311,10 @@ long mlock_vma_pages_range(struct vm_area_struct *vma,
 			is_vm_hugetlb_page(vma) ||
 			vma == get_gate_vma(current))) {
 
-		return __mlock_vma_pages_range(vma, start, end, 1);
+		__mlock_vma_pages_range(vma, start, end, 1);
+
+		/* Hide errors from mmap() and other callers */
+		return 0;
 	}
 
 	/*