Catch up to WAIT/NOWAIT cleanup.

2 files changed, 3 insertions, 30 deletions

diff --git a/share/man/man9/malloc.9 b/share/man/man9/malloc.9
index 3e19e9930db7..5626529319dd 100644
--- a/share/man/man9/malloc.9
+++ b/share/man/man9/malloc.9
@@ -154,27 +154,8 @@ will return
 .Dv NULL
 rather than block.
 Note that
-.Dv M_WAITOK
-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.
 .Fn malloc ,
 .Fn realloc ,
 and
diff --git a/share/man/man9/mbuf.9 b/share/man/man9/mbuf.9
index b10e6ea73a7c..4cf163f53d84 100644
--- a/share/man/man9/mbuf.9
+++ b/share/man/man9/mbuf.9
@@ -278,14 +278,14 @@ on failure.
 The
 .Fa how
 argument is to be set to
-.Dv M_TRYWAIT
+.Dv 0
 or
-.Dv M_DONTWAIT .
+.Dv M_NOWAIT .
 It specifies whether the caller is willing to block if necessary.
 If
 .Fa how
 is set to
-.Dv M_TRYWAIT ,
+.Dv 0 ,
 a failed allocation will result in the caller being put
 to sleep for a designated
 kern.ipc.mbuf_wait
@@ -295,14 +295,6 @@ number of ticks.
 A number of other mbuf-related
 functions and macros have the same argument because they may
 at some point need to allocate new mbufs.
-.Pp
-Programmers should be careful not to confuse the mbuf allocation flag
-.Dv M_DONTWAIT
-with the
-.Xr malloc 9
-allocation flag,
-.Dv M_NOWAIT .
-They are not the same.
 .It Fn MGETHDR mbuf how type
 Allocate an mbuf and initialize it to contain a packet header
 and internal data.