From 1e73455ba1c41cf34590c3875ddbcf781b97a308 Mon Sep 17 00:00:00 2001
From: Tom Rhodes <trhodes@FreeBSD.org>
Date: Mon, 24 Feb 2003 05:53:27 +0000
Subject: [PATCH] Return bits which were removed in revision 1.28.

Requested by:	imp
---
 share/man/man9/malloc.9 | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/share/man/man9/malloc.9 b/share/man/man9/malloc.9
index ad5ccc4ec384..b22852cb8aa0 100644
--- a/share/man/man9/malloc.9
+++ b/share/man/man9/malloc.9
@@ -156,7 +156,26 @@ will return
 rather than block.
 Note that
 .Dv M_NOWAIT
+is defined to be 0, meaning that blocking operation is the default.
+Also note that
+.Dv M_NOWAIT
 is required when running in an interrupt context.
+.Pp
+Programmers should be careful not to confuse
+.Dv M_NOWAIT ,
+the
+.Fn malloc
+flag, with
+.Dv M_DONTWAIT ,
+an
+.Xr mbuf 9
+allocation flag, which is not a valid argument to
+.Fn malloc .
+.It Dv M_WAITOK
+Indicates that it is Ok to wait for resources.  It is unconveniently
+defined as 0 so care should be taken never to compare against this value
+directly or try to AND it as a flag.  The default operation is to block
+until the memory allocation succeeds.
 The
 .Fn malloc ,
 .Fn realloc ,