LDP: Update original to LDP v3.79

[linuxjm/LDP_man-pages.git] / original / man2 / mlock.2

diff --git a/original/man2/mlock.2 b/original/man2/mlock.2
index dbc385b..ef73458 100644 (file)
--- a/original/man2/mlock.2
+++ b/original/man2/mlock.2
@@ -23,7 +23,7 @@
 .\" <http://www.gnu.org/licenses/>.
 .\" %%%LICENSE_END
 .\"
-.TH MLOCK 2 2011-09-14 "Linux" "Linux Programmer's Manual"
+.TH MLOCK 2 2014-04-14 "Linux" "Linux Programmer's Manual"
 .SH NAME
 mlock, munlock, mlockall, munlockall \- lock and unlock memory
 .SH SYNOPSIS
@@ -94,7 +94,7 @@ the process.
 Lock all pages which will become mapped into the address space of the
 process in the future.
 These could be for instance new pages required
-by a growing heap and stack as well as new memory mapped files or
+by a growing heap and stack as well as new memory-mapped files or
 shared memory regions.
 .PP
 If
@@ -247,6 +247,13 @@ Memory locks are not inherited by a child created via
 and are automatically removed (unlocked) during an
 .BR execve (2)
 or when the process terminates.
+The
+.BR mlockall ()
+.B MCL_FUTURE
+setting is not inherited by a child created via
+.BR fork (2)
+and is cleared during an
+.BR execve (2).
 
 The memory lock on an address range is automatically removed
 if the address range is unmapped via
@@ -333,3 +340,12 @@ resource limit is encountered.
 .BR sysconf (3),
 .BR proc (5),
 .BR capabilities (7)
+.SH COLOPHON
+This page is part of release 3.79 of the Linux
+.I man-pages
+project.
+A description of the project,
+information about reporting bugs,
+and the latest version of this page,
+can be found at
+\%http://www.kernel.org/doc/man\-pages/.