projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[linux-2.6-block.git]
/
mm
/
mlock.c
diff --git
a/mm/mlock.c
b/mm/mlock.c
index 2b57f7e603906aec66aa7f8bdfd0861fd04ccb8f..cbe9e0581b75dcaf06335ccc017a68789d6247d2 100644
(file)
--- 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;
}
/*