aboutsummaryrefslogtreecommitdiff
path: root/share/man/man9/malloc.9
diff options
context:
space:
mode:
authorAlan Cox <alc@FreeBSD.org>2012-11-16 06:40:40 +0000
committerAlan Cox <alc@FreeBSD.org>2012-11-16 06:40:40 +0000
commit96509a1fd92e61f1800f47075245ee19aaa2a108 (patch)
tree749ed289be8d8b939a657ab4a563d893db0aa5a3 /share/man/man9/malloc.9
parentea293f3f1d970dfc2a81dbacc358e27729343940 (diff)
M_USE_RESERVE is no longer deprecated. It is once again supported.
Reviewed by: kib
Notes
Notes: svn path=/head/; revision=243137
Diffstat (limited to 'share/man/man9/malloc.9')
-rw-r--r--share/man/man9/malloc.915
1 files changed, 7 insertions, 8 deletions
diff --git a/share/man/man9/malloc.9 b/share/man/man9/malloc.9
index 51b8cd390e25..6d8605312f7c 100644
--- a/share/man/man9/malloc.9
+++ b/share/man/man9/malloc.9
@@ -29,7 +29,7 @@
.\" $NetBSD: malloc.9,v 1.3 1996/11/11 00:05:11 lukem Exp $
.\" $FreeBSD$
.\"
-.Dd January 28, 2012
+.Dd November 15, 2012
.Dt MALLOC 9
.Os
.Sh NAME
@@ -153,13 +153,12 @@ if
.Dv M_WAITOK
is specified.
.It Dv M_USE_RESERVE
-Indicates that the system can dig into its reserve in order to obtain the
-requested memory.
-This option used to be called
-.Dv M_KERNEL
-but has been renamed to something more obvious.
-This option has been deprecated and is slowly being removed from the kernel,
-and so should not be used with any new programming.
+Indicates that the system can use its reserve of memory to satisfy the
+request.
+This option should only be used in combination with
+.Dv M_NOWAIT
+when an allocation failure cannot be tolerated by the caller without
+catastrophic effects on the system.
.El
.Pp
Exactly one of either