Date: Tue, 25 Dec 2012 13:43:01 +0000 (UTC) From: Andrey Zonov <zont@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r244679 - head/lib/libc/sys Message-ID: <201212251343.qBPDh1aM065021@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: zont Date: Tue Dec 25 13:43:01 2012 New Revision: 244679 URL: http://svnweb.freebsd.org/changeset/base/244679 Log: - Update manual pages accordingly to r244384 and r244385. Approved by: kib (mentor) MFC after: 1 week Modified: head/lib/libc/sys/mlock.2 head/lib/libc/sys/mlockall.2 Modified: head/lib/libc/sys/mlock.2 ============================================================================== --- head/lib/libc/sys/mlock.2 Tue Dec 25 13:01:58 2012 (r244678) +++ head/lib/libc/sys/mlock.2 Tue Dec 25 13:43:01 2012 (r244679) @@ -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 Modified: head/lib/libc/sys/mlockall.2 ============================================================================== --- head/lib/libc/sys/mlockall.2 Tue Dec 25 13:01:58 2012 (r244678) +++ head/lib/libc/sys/mlockall.2 Tue Dec 25 13:43:01 2012 (r244679) @@ -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 s 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212251343.qBPDh1aM065021>