From a1c9af3c2c13417684044de10947f4a73363e1e1 Mon Sep 17 00:00:00 2001
From: David Gwynne <dlg@cvs.openbsd.org>
Date: Wed, 26 Mar 2014 06:05:08 +0000
Subject: CONTEXT for malloc.

feels a bit clumsy, hopefully jmc can help.
---
 share/man/man9/malloc.9 | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

(limited to 'share/man/man9/malloc.9')

diff --git a/share/man/man9/malloc.9 b/share/man/man9/malloc.9
index 8de3d269da8..52dea68cc97 100644
--- a/share/man/man9/malloc.9
+++ b/share/man/man9/malloc.9
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: malloc.9,v 1.49 2013/07/04 17:39:45 tedu Exp $
+.\"	$OpenBSD: malloc.9,v 1.50 2014/03/26 06:05:07 dlg Exp $
 .\"	$NetBSD: malloc.9,v 1.2 1996/10/30 05:29:54 lukem Exp $
 .\"
 .\" Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: July 4 2013 $
+.Dd $Mdocdate: March 26 2014 $
 .Dt MALLOC 9
 .Os
 .Sh NAME
@@ -286,6 +286,19 @@ AGP memory.
 .It Dv M_DRM
 Direct Rendering Manager.
 .El
+.Sh CONTEXT
+.Fn malloc
+can be called during autoconf, or from process context if
+.Dv M_WAITOK
+is passed via
+.Fa flags ,
+or during during autoconf, from process context, or from interrupt context if
+.Dv M_NOWAIT
+is passed via
+.Fa flags .
+.Pp
+.Fn free
+can be called during autoconf, from process context, or from interrupt context.
 .Sh RETURN VALUES
 .Fn malloc
 returns a kernel virtual address that is suitably aligned for storage of
-- 
cgit v1.2.3