Author: glebius
Date: Mon Jun 24 09:35:14 2013
New Revision: 252154
URL: http://svnweb.freebsd.org/changeset/base/252154
Log:
Merge r248489:
There are actually two different cases when mlock(2) returns
ENOMEM. Clarify this, taking text from SUS.
Reviewed by: kib
Modified:
stable/9/lib/libc/sys/mlock.2
Directory Properties:
stable/9/lib/libc/ (props changed)
stable/9/lib/libc/sys/ (props changed)
Modified: stable/9/lib/libc/sys/mlock.2
==============================================================================
--- stable/9/lib/libc/sys/mlock.2 Mon Jun 24 09:33:21 2013
(r252153)
+++ stable/9/lib/libc/sys/mlock.2 Mon Jun 24 09:35:14 2013
(r252154)
@@ -28,7 +28,7 @@
.\" @(#)mlock.2 8.2 (Berkeley) 12/11/93
.\" $FreeBSD$
.\"
-.Dd December 25, 2012
+.Dd March 18, 2013
.Dt MLOCK 2
.Os
.Sh NAME
@@ -138,7 +138,12 @@ is set to 0 and the caller is not the su
.It Bq Er EINVAL
The address given is not page aligned or the length is negative.
.It Bq Er ENOMEM
-Some portion of the indicated address range is not allocated.
+Some or all of the address range specified by the addr and len
+arguments does not correspond to valid mapped pages in the address space
+of the process.
+.It Bq Er ENOMEM
+Locking the pages mapped by the specified range would exceed a limit on
+the amount of memory that the process may lock.
.El
.Sh "SEE ALSO"
.Xr fork 2 ,
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"
