aboutsummaryrefslogtreecommitdiff
path: root/share/man/man9/malloc.9
diff options
context:
space:
mode:
authorHartmut Brandt <harti@FreeBSD.org>2003-06-12 09:03:15 +0000
committerHartmut Brandt <harti@FreeBSD.org>2003-06-12 09:03:15 +0000
commiteb74baf398ada70adce16a71e183272c40a025e0 (patch)
tree43e9bd8b2214e82a8964e90118bc591992b1606f /share/man/man9/malloc.9
parent403de99214c36f7e8a6e8b346d9bf0081529735a (diff)
downloadsrc-eb74baf398ada70adce16a71e183272c40a025e0.tar.gz
src-eb74baf398ada70adce16a71e183272c40a025e0.zip
Rename the section 'locking considerations' into 'context'.
Change the wording in this section to get rid of references to mutexes and talk about sleeping instead. Discussed with: jhb@, ru@
Notes
Notes: svn path=/head/; revision=116254
Diffstat (limited to 'share/man/man9/malloc.9')
-rw-r--r--share/man/man9/malloc.915
1 files changed, 5 insertions, 10 deletions
diff --git a/share/man/man9/malloc.9 b/share/man/man9/malloc.9
index 9cbfc2e555a0..0cb271abc24e 100644
--- a/share/man/man9/malloc.9
+++ b/share/man/man9/malloc.9
@@ -36,7 +36,7 @@
.\" $NetBSD: malloc.9,v 1.3 1996/11/11 00:05:11 lukem Exp $
.\" $FreeBSD$
.\"
-.Dd April 9, 2003
+.Dd June 12, 2003
.Dt MALLOC 9
.Os
.Sh NAME
@@ -260,7 +260,7 @@ flags
.Dv M_DONTWAIT
and
.Dv M_TRYWAIT .
-.Sh LOCKING CONSIDERATIONS
+.Sh CONTEXT
.Fn malloc ,
.Fn realloc
and
@@ -275,15 +275,10 @@ must contain
.Fn realloc
and
.Fn reallocf
-must not be called with
-.Dv M_WAITOK
-while a mutex other than
-.Va Giant
-is held.
-.Va Giant
-may or may not be held when
+may sleep when called with
+.Dv M_WAITOK .
.Fn free
-is called.
+never sleeps.
.Pp
Any calls to
.Fn malloc