From 5c87853817b2032c817a0c832cd0204383822d44 Mon Sep 17 00:00:00 2001
From: Hugh Dickins <hugh@veritas.com>
Date: Sun, 8 Feb 2009 20:56:58 +0000
Subject: [PATCH] --- yaml --- r: 131126 b: refs/heads/master c:
 d5b562330ec766292a3ac54ae5e0673610bd5b3d h: refs/heads/master v: v3

---
 [refs]           | 2 +-
 trunk/mm/mlock.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d75ebc2c2268..7a56736e8b7e 100644
--- 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
index 028ec482fdd4..037161d61b4e 100644
--- 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;
 	}
 
 	/*