diff options
| author |   jmc <jmc@openbsd.org> | 2014-03-27 07:28:35 +0000 |
|---|---|---|
| committer | jmc <jmc@openbsd.org> | 2014-03-27 07:28:35 +0000 |
| commit | 407a23c3a85875f3f38d9d403839c7bd0986ab76 (patch) | |
| tree | 8e9f418cd7ea3e46ed83111bf1687403a8a3f133 | |
| parent | restore_sum: remove newly created sum file(s). (diff) | |
| download | wireguard-openbsd-407a23c3a85875f3f38d9d403839c7bd0986ab76.tar.xz wireguard-openbsd-407a23c3a85875f3f38d9d403839c7bd0986ab76.zip | |
tweak previous; help/ok dlg
| -rw-r--r-- | share/man/man9/malloc.9 | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/share/man/man9/malloc.9 b/share/man/man9/malloc.9 index 52dea68cc97..b662bceffa2 100644 --- a/share/man/man9/malloc.9 +++ b/share/man/man9/malloc.9 @@ -1,4 +1,4 @@ -.\" $OpenBSD: malloc.9,v 1.50 2014/03/26 06:05:07 dlg Exp $ +.\" $OpenBSD: malloc.9,v 1.51 2014/03/27 07:28:35 jmc 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: March 26 2014 $ +.Dd $Mdocdate: March 27 2014 $ .Dt MALLOC 9 .Os .Sh NAME @@ -288,12 +288,14 @@ Direct Rendering Manager. .El .Sh CONTEXT .Fn malloc -can be called during autoconf, or from process context if -.Dv M_WAITOK +can be called, +if +.Dv M_NOWAIT is passed via .Fa flags , -or during during autoconf, from process context, or from interrupt context if -.Dv M_NOWAIT +during autoconf, from process context, or from interrupt context; +it can't be called from interrupt context if +.Dv M_WAITOK is passed via .Fa flags . .Pp |