diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
| commit | d6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch) | |
| tree | e2be02f33984c48ec019c654051d27964e42c441 /mm/mlock.c | |
| parent | 609d1e803baf519487233b765eb487f9ec227a18 (diff) | |
Merge with 2.3.19.
Diffstat (limited to 'mm/mlock.c')
| -rw-r--r-- | mm/mlock.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mm/mlock.c b/mm/mlock.c index d6b19cfb1..be5e07cbf 100644 --- a/mm/mlock.c +++ b/mm/mlock.c @@ -130,7 +130,7 @@ static int do_mlock(unsigned long start, size_t len, int on) struct vm_area_struct * vma, * next; int error; - if (!capable(CAP_IPC_LOCK)) + if (on && !capable(CAP_IPC_LOCK)) return -EPERM; len = (len + ~PAGE_MASK) & PAGE_MASK; end = start + len; @@ -172,7 +172,7 @@ static int do_mlock(unsigned long start, size_t len, int on) return error; } -asmlinkage int sys_mlock(unsigned long start, size_t len) +asmlinkage long sys_mlock(unsigned long start, size_t len) { unsigned long locked; unsigned long lock_limit; @@ -203,7 +203,7 @@ out: return error; } -asmlinkage int sys_munlock(unsigned long start, size_t len) +asmlinkage long sys_munlock(unsigned long start, size_t len) { int ret; @@ -244,7 +244,7 @@ static int do_mlockall(int flags) return error; } -asmlinkage int sys_mlockall(int flags) +asmlinkage long sys_mlockall(int flags) { unsigned long lock_limit; int ret = -EINVAL; @@ -271,7 +271,7 @@ out: return ret; } -asmlinkage int sys_munlockall(void) +asmlinkage long sys_munlockall(void) { int ret; |