diff options
| -rw-r--r-- | share/man/man9/Makefile | 4 | ||||
| -rw-r--r-- | share/man/man9/malloc.9 | 26 |
2 files changed, 6 insertions, 24 deletions
diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index e1082e31046..6358bc00f94 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.143 2008/07/23 11:45:21 art Exp $ +# $OpenBSD: Makefile,v 1.144 2008/09/02 21:42:05 chl Exp $ # $NetBSD: Makefile,v 1.4 1996/01/09 03:23:01 thorpej Exp $ # Makefile for section 9 (kernel function and variable) manual pages. @@ -194,7 +194,7 @@ MLINKS+=lock.9 lockinit.9 lock.9 lockmgr.9 lock.9 lockstatus.9 \ lock.9 simple_lock_init.9 lock.9 simple_lock.9 \ lock.9 simple_lock_try.9 lock.9 simple_unlock.9 MLINKS+=log.9 addlog.9 -MLINKS+=malloc.9 MALLOC.9 malloc.9 free.9 malloc.9 FREE.9 +MLINKS+=malloc.9 free.9 MLINKS+=mbuf.9 m_copym2.9 mbuf.9 m_copym.9 mbuf.9 m_free.9 mbuf.9 MFREE.9 \ mbuf.9 m_get.9 mbuf.9 MGET.9 mbuf.9 m_getclr.9 mbuf.9 m_gethdr.9 \ mbuf.9 MGETHDR.9 mbuf.9 m_prepend.9 mbuf.9 M_PREPEND.9 \ diff --git a/share/man/man9/malloc.9 b/share/man/man9/malloc.9 index 1b102dbfca1..b217e5a9c4d 100644 --- a/share/man/man9/malloc.9 +++ b/share/man/man9/malloc.9 @@ -1,4 +1,4 @@ -.\" $OpenBSD: malloc.9,v 1.41 2008/06/26 05:42:08 ray Exp $ +.\" $OpenBSD: malloc.9,v 1.42 2008/09/02 21:42:05 chl Exp $ .\" $NetBSD: malloc.9,v 1.2 1996/10/30 05:29:54 lukem Exp $ .\" .\" Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -28,21 +28,20 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: June 26 2008 $ +.Dd $Mdocdate: September 2 2008 $ .Dt MALLOC 9 .Os .Sh NAME -.Nm malloc +.Nm malloc , +.Nm free .Nd kernel memory allocator .Sh SYNOPSIS .Fd #include <sys/types.h> .Fd #include <sys/malloc.h> .Ft void * .Fn malloc "unsigned long size" "int type" "int flags" -.Fn MALLOC "space" "cast" "unsigned long size" "int type" "int flags" .Ft void .Fn free "void *addr" "int type" -.Fn FREE "void *addr" "int type" .Sh DESCRIPTION The .Fn malloc @@ -55,23 +54,6 @@ releases memory at address that was previously allocated by .Fn malloc for re-use. -The -.Fn MALLOC -macro variant is functionally equivalent to -.Bd -literal -offset indent -(space) = (cast)malloc((u_long)(size), type, flags) -.Ed -.Pp -and the -.Fn FREE -macro variant is equivalent to -.Bd -literal -offset indent -free((caddr_t)(addr), type) -.Ed -.Pp -These macros should only be used when the -.Fa size -argument is a constant. .Pp Unlike its standard C library counterpart .Pq Xr malloc 3 , |