diff options
| author | zont <zont@FreeBSD.org> | 2012-12-25 13:43:01 +0000 |
|---|---|---|
| committer | zont <zont@FreeBSD.org> | 2012-12-25 13:43:01 +0000 |
| commit | 1c06919638a5a652db6f6496cacf300b62880652 (patch) | |
| tree | 849c869d4920ab2b59408d59e6a888362d7c2353 /lib/libc/sys | |
| parent | 9f622a1b388500854580966c32199975628916ba (diff) | |
| download | FreeBSD-src-1c06919638a5a652db6f6496cacf300b62880652.zip FreeBSD-src-1c06919638a5a652db6f6496cacf300b62880652.tar.gz | |
- Update manual pages accordingly to r244384 and r244385.
Approved by: kib (mentor)
MFC after: 1 week
Diffstat (limited to 'lib/libc/sys')
| -rw-r--r-- | lib/libc/sys/mlock.2 | 17 | ||||
| -rw-r--r-- | lib/libc/sys/mlockall.2 | 17 |
2 files changed, 25 insertions, 9 deletions
diff --git a/lib/libc/sys/mlock.2 b/lib/libc/sys/mlock.2 index ed9c15a..0e5fef8 100644 --- a/lib/libc/sys/mlock.2 +++ b/lib/libc/sys/mlock.2 @@ -28,7 +28,7 @@ .\" @(#)mlock.2 8.2 (Berkeley) 12/11/93 .\" $FreeBSD$ .\" -.Dd July 27, 2010 +.Dd December 25, 2012 .Dt MLOCK 2 .Os .Sh NAME @@ -94,12 +94,15 @@ limited in how much they can lock down. A single process can .Fn mlock the minimum of -a system-wide ``wired pages'' limit and -the per-process +a system-wide ``wired pages'' limit +.Va vm.max_wired +and the per-process .Li RLIMIT_MEMLOCK resource limit. .Pp -These calls are only available to the super-user. +If +.Va security.bsd.unprivileged_mlock +is set to 0 these calls are only available to the super-user. .Sh RETURN VALUES .Rv -std .Pp @@ -112,7 +115,8 @@ system call will fail if: .Bl -tag -width Er .It Bq Er EPERM -The caller is not the super-user. +.Va security.bsd.unprivileged_mlock +is set to 0 and the caller is not the super-user. .It Bq Er EINVAL The address given is not page aligned or the length is negative. .It Bq Er EAGAIN @@ -129,7 +133,8 @@ system call will fail if: .Bl -tag -width Er .It Bq Er EPERM -The caller is not the super-user. +.Va security.bsd.unprivileged_mlock +is set to 0 and the caller is not the super-user. .It Bq Er EINVAL The address given is not page aligned or the length is negative. .It Bq Er ENOMEM diff --git a/lib/libc/sys/mlockall.2 b/lib/libc/sys/mlockall.2 index 54ae23e..23c644a 100644 --- a/lib/libc/sys/mlockall.2 +++ b/lib/libc/sys/mlockall.2 @@ -30,7 +30,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 27, 2010 +.Dd December 25, 2012 .Dt MLOCKALL 2 .Os .Sh NAME @@ -68,11 +68,22 @@ Since physical memory is a potentially scarce resource, processes are limited in how much they can lock down. A single process can lock the minimum of a system-wide .Dq wired pages -limit and the per-process +limit +.Va vm.max_wired +and the per-process .Dv RLIMIT_MEMLOCK resource limit. .Pp -These calls are only available to the super-user. +If +.Va security.bsd.unprivileged_mlock +is set to 0 these calls are only available to the super-user. +If +.Va vm.old_mlock +is set to 1 the per-process +.Dv RLIMIT_MEMLOCK +resource limit will not be applied for +.Fn mlockall +calls. .Pp The .Fn munlockall |
