svn commit: r266982 - stable/9/lib/libc/sys

[Benjamin Kaduk]

Author: bjk (doc committer)
Date: Mon Jun  2 20:23:41 2014
New Revision: 266982
URL: http://svnweb.freebsd.org/changeset/base/266982

Log:
  MFC r266285,266866:
  
      ------------------------------------------------------------------------
      r266285 | bjk | 2014-05-16 23:05:52 -0400 (Fri, 16 May 2014) | 9 lines
  
      Correct documentation of the limit on how much memory can be mlock()ed
  
      vm.max_wired is a system-wide limit, not per-process.  Reword the
      section to make this more clear.
  
      PR:             docs/189214
      Submitted by:   Lawrence Chen (original text)
      Approved by:    hrs (mentor)
  
      ------------------------------------------------------------------------
      r266866 | bjk | 2014-05-29 22:16:28 -0400 (Thu, 29 May 2014) | 5 lines
  
      Minor mdoc fix
  
      Submitted by:   hrs
      Approved by:    hrs (mentor, implicit)
  
      ------------------------------------------------------------------------
  
  PR:		189214
  Approved by:	re (gjb), hrs (mentor)

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  2 19:53:53 2014	(r266981)
+++ stable/9/lib/libc/sys/mlock.2	Mon Jun  2 20:23:41 2014	(r266982)
@@ -28,7 +28,7 @@
 .\"	@(#)mlock.2	8.2 (Berkeley) 12/11/93
 .\" $FreeBSD$
 .\"
-.Dd March 18, 2013
+.Dd May 17, 2014
 .Dt MLOCK 2
 .Os
 .Sh NAME
@@ -91,14 +91,21 @@ Locked mappings are not inherited by the
 .Pp
 Since physical memory is a potentially scarce resource, processes are
 limited in how much they can lock down.
-A single process can
+The amount of memory that a single process can
 .Fn mlock
-the minimum of
-a system-wide ``wired pages'' limit
+is limited by both the per-process
+.Dv RLIMIT_MEMLOCK
+resource limit and the
+system-wide
+.Dq wired pages
+limit
+.Va vm.max_wired .
 .Va vm.max_wired
-and the per-process
-.Li RLIMIT_MEMLOCK
-resource limit.
+applies to the system as a whole, so the amount available to a single
+process at any given time is the difference between
+.Va vm.max_wired
+and
+.Va vm.stats.vm.v_wire_count .
 .Pp
 If
 .Va security.bsd.unprivileged_mlock