diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-10 13:25:42 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-10 13:25:42 +0100 |
| commit | f9915bfef3c64ea0b0b960dd1b999b584a7ef460 (patch) | |
| tree | ec8d1c35a542e4c8e08b5a2be380b2bdef9a10d0 /mm | |
| parent | b91facc367366b3f71375f337eb5997ec9ab4e69 (diff) | |
| parent | acd895795d35d7c6405f20301a846d16998795ec (diff) | |
| download | blackbird-op-linux-f9915bfef3c64ea0b0b960dd1b999b584a7ef460.tar.gz blackbird-op-linux-f9915bfef3c64ea0b0b960dd1b999b584a7ef460.zip | |
Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/mlock.c | 5 |
1 files changed, 4 insertions, 1 deletions
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; } /* |
