projects
/
cascardo
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 2:
43a9907
)
Merge branch 'fix/oss-header-fix' into for-linus
author
Takashi Iwai
<tiwai@suse.de>
Fri, 13 Feb 2009 14:05:51 +0000
(15:05 +0100)
committer
Takashi Iwai
<tiwai@suse.de>
Fri, 13 Feb 2009 14:05:51 +0000
(15:05 +0100)
mm/mlock.c
patch
|
blob
|
history
diff --git
a/mm/mlock.c
b/mm/mlock.c
index
028ec48
..
037161d
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;
}
/*