summaryrefslogtreecommitdiffstats
path: root/share/man
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2004-02-16 21:36:59 +0000
committerdes <des@FreeBSD.org>2004-02-16 21:36:59 +0000
commit00e29c835ff33dec94e391613de033841073fe57 (patch)
treed6619df66f96bcd3b86955cc9984b19991563f56 /share/man
parentcc76e7c5a366bb66840187e7244b0225fd690620 (diff)
downloadFreeBSD-src-00e29c835ff33dec94e391613de033841073fe57.zip
FreeBSD-src-00e29c835ff33dec94e391613de033841073fe57.tar.gz
Back out previous commit due to objections.
Diffstat (limited to 'share/man')
-rw-r--r--share/man/man9/malloc.911
1 files changed, 5 insertions, 6 deletions
diff --git a/share/man/man9/malloc.9 b/share/man/man9/malloc.9
index a6dd849..fea6396d 100644
--- a/share/man/man9/malloc.9
+++ b/share/man/man9/malloc.9
@@ -164,17 +164,16 @@ is required when running in an interrupt context.
Indicates that it is OK to wait for resources.
If the request cannot be immediately fulfilled, the current process is put
to sleep to wait for resources to be released by other processes.
-When
-.Dv M_WAITOK
-is specified, the
+The
.Fn malloc ,
.Fn realloc ,
and
.Fn reallocf
-cannot return
+functions cannot return
.Dv NULL
-unless the requested allocation size is too large for the kernel
-memory map.
+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.
OpenPOWER on IntegriCloud