From 8f8f99d37a6fd13f0b152a5a24dc01f82ba74580 Mon Sep 17 00:00:00 2001 From: alc Date: Fri, 16 Nov 2012 06:40:40 +0000 Subject: M_USE_RESERVE is no longer deprecated. It is once again supported. Reviewed by: kib --- share/man/man9/malloc.9 | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'share') diff --git a/share/man/man9/malloc.9 b/share/man/man9/malloc.9 index 51b8cd3..6d86053 100644 --- a/share/man/man9/malloc.9 +++ b/share/man/man9/malloc.9 @@ -29,7 +29,7 @@ .\" $NetBSD: malloc.9,v 1.3 1996/11/11 00:05:11 lukem Exp $ .\" $FreeBSD$ .\" -.Dd January 28, 2012 +.Dd November 15, 2012 .Dt MALLOC 9 .Os .Sh NAME @@ -153,13 +153,12 @@ if .Dv M_WAITOK is specified. .It Dv M_USE_RESERVE -Indicates that the system can dig into its reserve in order to obtain the -requested memory. -This option used to be called -.Dv M_KERNEL -but has been renamed to something more obvious. -This option has been deprecated and is slowly being removed from the kernel, -and so should not be used with any new programming. +Indicates that the system can use its reserve of memory to satisfy the +request. +This option should only be used in combination with +.Dv M_NOWAIT +when an allocation failure cannot be tolerated by the caller without +catastrophic effects on the system. .El .Pp Exactly one of either -- cgit v1.1