X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;ds=sidebyside;f=mm%2Fmlock.c;h=cbe9e0581b75dcaf06335ccc017a68789d6247d2;hb=76a67ec6fb79ff3570dcb5342142c16098299911;hp=2b57f7e603906aec66aa7f8bdfd0861fd04ccb8f;hpb=9f339e7028e2855717af3193c938f9960ad13b38;p=safe%2Fjmp%2Flinux-2.6

diff --git a/mm/mlock.c b/mm/mlock.c
index 2b57f7e..cbe9e05 100644
--- a/mm/mlock.c
+++ b/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;
 	}
 
 	/*