From owner-svn-src-head@FreeBSD.ORG  Tue Jul 27 20:34:38 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2CD0C106566C;
	Tue, 27 Jul 2010 20:34:38 +0000 (UTC)
	(envelope-from trasz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1BC9A8FC1B;
	Tue, 27 Jul 2010 20:34:38 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o6RKYcut002348;
	Tue, 27 Jul 2010 20:34:38 GMT (envelope-from trasz@svn.freebsd.org)
Received: (from trasz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6RKYbht002345;
	Tue, 27 Jul 2010 20:34:37 GMT (envelope-from trasz@svn.freebsd.org)
Message-Id: <201007272034.o6RKYbht002345@svn.freebsd.org>
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Tue, 27 Jul 2010 20:34:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r210551 - head/lib/libc/sys
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Jul 2010 20:34:38 -0000

Author: trasz
Date: Tue Jul 27 20:34:37 2010
New Revision: 210551
URL: http://svn.freebsd.org/changeset/base/210551

Log:
  Update mlockall(2) to mention that it's superuser-only syscall, just
  like the mlock(2) manual page says.  Update mlock(2) to say that hitting
  RLIMIT_MEMLOCK results in ENOMEM, not EAGAIN.
  
  MFC after:	1 month

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 Jul 27 20:33:50 2010	(r210550)
+++ head/lib/libc/sys/mlock.2	Tue Jul 27 20:34:37 2010	(r210551)
@@ -28,7 +28,7 @@
 .\"	@(#)mlock.2	8.2 (Berkeley) 12/11/93
 .\" $FreeBSD$
 .\"
-.Dd August 10, 2004
+.Dd July 27, 2010
 .Dt MLOCK 2
 .Os
 .Sh NAME
@@ -116,11 +116,12 @@ 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
-Locking the indicated range would exceed either the system or per-process
-limit for locked memory.
+Locking the indicated range would exceed the system limit for locked memory.
 .It Bq Er ENOMEM
 Some portion of the indicated address range is not allocated.
 There was an error faulting/mapping a page.
+Locking the indicated range would exceed the per-process limit for locked
+memory.
 .El
 The
 .Fn munlock

Modified: head/lib/libc/sys/mlockall.2
==============================================================================
--- head/lib/libc/sys/mlockall.2	Tue Jul 27 20:33:50 2010	(r210550)
+++ head/lib/libc/sys/mlockall.2	Tue Jul 27 20:34:37 2010	(r210551)
@@ -30,7 +30,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 12, 1999
+.Dd July 27, 2010
 .Dt MLOCKALL 2
 .Os
 .Sh NAME
@@ -72,6 +72,8 @@ limit and the per-process
 .Dv RLIMIT_MEMLOCK
 resource limit.
 .Pp
+These calls are only available to the super-user.
+.Pp
 The
 .Fn munlockall
 call unlocks any locked memory regions in the process address space.