X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=mm%2Fmlock.c;h=037161d61b4e72432d9d6bae71507d251b522afc;hb=6c6f1f0f4db31a192916eaa31ec2f114fda7d5e5;hp=028ec482fdd44488db7b562358770c80ea60f49b;hpb=86adf8adfcb3d3f4b6c30aeb40da480da02de1d1;p=karo-tx-linux.git

diff --git a/mm/mlock.c b/mm/mlock.c
index 028ec482fdd4..037161d61b4e 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;
 	}
 
 	/*