| commit | ebb88024aa1b14a86ecc3a9da013f6713664d94b | [log] [tgz] |
|---|---|---|
| author | Takashi Iwai <tiwai@suse.de> | Fri Feb 13 15:05:51 2009 +0100 |
| committer | Takashi Iwai <tiwai@suse.de> | Fri Feb 13 15:05:51 2009 +0100 |
| tree | 83bf2de570b16590ea21d0f91b9f23c0c1af40f7 | |
| parent | d5b562330ec766292a3ac54ae5e0673610bd5b3d [diff] | |
| parent | 43a990765a9e874350bae1009366d00809dbc9d8 [diff] |
Merge branch 'fix/oss-header-fix' into for-linus
diff --git a/mm/mlock.c b/mm/mlock.c index 028ec48..037161d 100644 --- a/mm/mlock.c +++ b/mm/mlock.c
@@ -311,7 +311,10 @@ 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; } /*