<sys/malloc.h>: Remove the MALLOC() and FREE() macros.

diff --git a/Makefile_upgrade.inc b/Makefile_upgrade.inc
index f86c696..948e11e 100644 (file)
--- a/Makefile_upgrade.inc
+++ b/Makefile_upgrade.inc
@@ -1759,6 +1759,10 @@ TO_REMOVE+=/usr/libexec/binutils220
 TO_REMOVE+=/usr/share/zoneinfo/Europe/Tiraspol
 TO_REMOVE+=/usr/include/netatalk
 TO_REMOVE+=/usr/include/netproto/atalk
+TO_REMOVE+=/usr/share/man/cat9/MALLOC.9.gz
+TO_REMOVE+=/usr/share/man/man9/MALLOC.9.gz
+TO_REMOVE+=/usr/share/man/cat9/FREE.9.gz
+TO_REMOVE+=/usr/share/man/man9/FREE.9.gz
 
 .if ${MACHINE_ARCH} == "x86_64"
 TO_REMOVE+=/usr/libdata/stallion/2681.sys

diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile
index 93a3f99..9e7966e 100644 (file)
--- a/share/man/man9/Makefile
+++ b/share/man/man9/Makefile
@@ -543,10 +543,8 @@ MLINKS+=kenv.9 kfreeenv.9 \
        kenv.9 ktestenv.9 \
        kenv.9 kunsetenv.9
 MLINKS+=kernacc.9 useracc.9
-MLINKS+=kmalloc.9 FREE.9 \
-       kmalloc.9 kfree.9 \
+MLINKS+=kmalloc.9 kfree.9 \
        kmalloc.9 krealloc.9 \
-       kmalloc.9 MALLOC.9 \
        kmalloc.9 MALLOC_DECLARE.9 \
        kmalloc.9 MALLOC_DEFINE.9
 MLINKS+=kobj.9 DEFINE_CLASS.9 \

diff --git a/share/man/man9/kmalloc.9 b/share/man/man9/kmalloc.9
index 0c7dda3..e7e0e89 100644 (file)
--- a/share/man/man9/kmalloc.9
+++ b/share/man/man9/kmalloc.9
@@ -35,16 +35,13 @@
 .\"
 .\" $NetBSD: malloc.9,v 1.3 1996/11/11 00:05:11 lukem Exp $
 .\" $FreeBSD: src/share/man/man9/malloc.9,v 1.42 2005/02/22 17:20:20 brueffer Exp $
-.\" $DragonFly: src/share/man/man9/kmalloc.9,v 1.8 2008/01/19 08:23:17 swildner Exp $
 .\"
 .Dd January 15, 2010
 .Dt KMALLOC 9
 .Os
 .Sh NAME
 .Nm kmalloc ,
-.Nm MALLOC ,
 .Nm kfree ,
-.Nm FREE ,
 .Nm krealloc ,
 .Nm MALLOC_DEFINE ,
 .Nm MALLOC_DECLARE
@@ -54,10 +51,8 @@
 .In sys/malloc.h
 .Ft void *
 .Fn kmalloc "unsigned long size" "struct malloc_type *type" "int flags"
-.Fn MALLOC space cast "unsigned long size" "struct malloc_type *type" "int flags"
 .Ft void
 .Fn kfree "void *addr" "struct malloc_type *type"
-.Fn FREE "void *addr" "struct malloc_type *type"
 .Ft void *
 .Fn krealloc "void *addr" "unsigned long size" "struct malloc_type *type" "int flags"
 .Fn MALLOC_DECLARE type
@@ -113,20 +108,6 @@ function behaves identically to
 .Fn kmalloc
 for the specified size.
 .Pp
-The
-.Fn MALLOC
-macro variant is functionally equivalent to
-.Bd -literal -offset indent
-(space) = (cast)kmalloc((u_long)(size), type, flags)
-.Ed
-.Pp
-and the
-.Fn FREE
-macro variant is equivalent to
-.Bd -literal -offset indent
-kfree((addr), type)
-.Ed
-.Pp
 Unlike its standard C library counterpart
 .Pq Xr malloc 3 ,
 the kernel version takes two more arguments.
@@ -215,7 +196,7 @@ MALLOC_DEFINE(M_FOOBUF, "foobuffers", "Buffers to foo data into the ether");
 /* sys/something/foo_subr.c */
 
 \&...
-MALLOC(buf, struct foo_buf *, sizeof *buf, M_FOOBUF, M_NOWAIT);
+buf = kmalloc(sizeof *buf, M_FOOBUF, M_NOWAIT);
 
 .Ed
 .Sh IMPLEMENTATION NOTES

diff --git a/sys/sys/malloc.h b/sys/sys/malloc.h
index 4a4895c..8aeabf9 100644 (file)
--- a/sys/sys/malloc.h
+++ b/sys/sys/malloc.h
@@ -32,7 +32,6 @@
  *
  *     @(#)malloc.h    8.5 (Berkeley) 5/3/95
  * $FreeBSD: src/sys/sys/malloc.h,v 1.48.2.2 2002/03/16 02:19:16 archie Exp $
- * $DragonFly: src/sys/sys/malloc.h,v 1.30 2008/10/22 01:42:15 dillon Exp $
  */
 
 #ifndef _SYS_MALLOC_H_
@@ -160,13 +159,6 @@ MALLOC_DECLARE(M_IP6NDP); /* for INET6 */
 #define        MINALLOCSIZE    sizeof(void *)
 
 /*
- * Deprecated macro versions of not-quite-malloc() and free().
- */
-#define        MALLOC(space, cast, size, type, flags) \
-       (space) = (cast)kmalloc((u_long)(size), (type), (flags))
-#define        FREE(addr, type) kfree((addr), (type))
-
-/*
  * XXX this should be declared in <sys/uio.h>, but that tends to fail
  * because <sys/uio.h> is included in a header before the source file
  * has a chance to include <sys/malloc.h> to get MALLOC_DECLARE() defined.