Delete unused/obsolete M_* type values.

ok miod@ mpi@

diff --git a/share/man/man9/malloc.9 b/share/man/man9/malloc.9
index 729b76e..1d513d1 100644 (file)
--- a/share/man/man9/malloc.9
+++ b/share/man/man9/malloc.9
@@ -1,4 +1,4 @@
-.\"    $OpenBSD: malloc.9,v 1.67 2019/02/07 15:11:38 visa Exp $
+.\"    $OpenBSD: malloc.9,v 1.68 2022/02/03 17:18:22 guenther 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: February 7 2019 $
+.Dd $Mdocdate: February 3 2022 $
 .Dt MALLOC 9
 .Os
 .Sh NAME
@@ -158,8 +158,6 @@ Protocol control blocks.
 Routing tables.
 .It Dv M_IFADDR
 Interface addresses.
-.It Dv M_SOOPTS
-Socket options.
 .It Dv M_SYSCTL
 Sysctl persistent buffers.
 .It Dv M_COUNTERS
@@ -177,8 +175,6 @@ NFS request headers.
 NFS mount structures.
 .It Dv M_VNODE
 Dynamically allocated vnodes.
-.It Dv M_CACHE
-Dynamically allocated cache entries.
 .It Dv M_DQUOT
 UFS quota entries.
 .It Dv M_UFSMNT
@@ -195,8 +191,6 @@ UFS directory hash structures.
 ACPI structures.
 .It Dv M_VMPMAP
 VM pmap data.
-.It Dv M_FILE
-Open file structures.
 .It Dv M_FILEDESC
 Open file descriptor tables.
 .It Dv M_SIGIO
@@ -205,8 +199,6 @@ Sigio structures.
 Proc structures.
 .It Dv M_SUBPROC
 Proc sub-structures.
-.It Dv M_VCLUSTER
-Cluster for VFS.
 .It Dv M_MFSNODE
 MFS vnode private part.
 .It Dv M_NETADDR
@@ -278,8 +270,6 @@ data buffers.
 .It Dv M_CREDENTIALS
 .Xr ipsec 4
 related credentials.
-.It Dv M_EMULDATA
-Per process emulation data.
 .It Dv M_IP6OPT
 IPv6 options.
 .It Dv M_IP6NDP

diff --git a/sys/sys/malloc.h b/sys/sys/malloc.h
index b556990..97bf9ff 100644 (file)
--- a/sys/sys/malloc.h
+++ b/sys/sys/malloc.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: malloc.h,v 1.121 2021/03/09 15:08:23 bluhm Exp $      */
+/*     $OpenBSD: malloc.h,v 1.122 2022/02/03 17:18:22 guenther Exp $   */
 /*     $NetBSD: malloc.h,v 1.39 1998/07/12 19:52:01 augustss Exp $     */
 
 /*
@@ -72,7 +72,7 @@
 /* 7 - free */
 /* 8 - free */
 #define        M_IFADDR        9       /* interface address */
-#define        M_SOOPTS        10      /* socket options */
+/* 10 - free */
 #define        M_SYSCTL        11      /* sysctl buffers (persistent storage) */
 #define        M_COUNTERS      12      /* per CPU counters */
 /* 13 - free */
@@ -85,7 +85,7 @@
 #define        M_NFSMNT        23      /* NFS mount structure */
 #define        M_LOG           24      /* Messages in kernel log stash */
 #define        M_VNODE         25      /* Dynamically allocated vnodes */
-#define        M_CACHE         26      /* Dynamically allocated cache entries */
+/* 26 - free */
 #define        M_DQUOT         27      /* UFS quota entries */
 #define        M_UFSMNT        28      /* UFS mount structure */
 #define        M_SHM           29      /* SVID compatible shared memory segments */
@@ -94,14 +94,12 @@
 #define        M_DIRHASH       32      /* UFS dirhash */
 #define M_ACPI         33      /* ACPI */
 #define        M_VMPMAP        34      /* VM pmap */
-/* 35-37 - free */
-#define        M_FILE          38      /* Open file structure */
+/* 35-38 - free */
 #define        M_FILEDESC      39      /* Open file descriptor table */
 #define        M_SIGIO         40      /* Sigio structures */
 #define        M_PROC          41      /* Proc structures */
 #define        M_SUBPROC       42      /* Proc sub-structures */
-#define        M_VCLUSTER      43      /* Cluster for VFS */
-/* 45-46 - free */
+/* 43-45 - free */
 #define        M_MFSNODE       46      /* MFS vnode private part */
 /* 47-48 - free */
 #define        M_NETADDR       49      /* Export host address structure */
@@ -146,9 +144,7 @@
 #define M_CRYPTO_DATA  108     /* Crypto framework data buffers (keys etc.) */
 /* 109 - free */
 #define M_CREDENTIALS  110     /* IPsec-related credentials and ID info */
-/* 111-113 - free */
-#define        M_EMULDATA      114     /* Per-process emulation data */
-/* 115-122 - free */
+/* 111-122 - free */
 
 /* KAME IPv6 */
 #define        M_IP6OPT        123     /* IPv6 options */
@@ -194,7 +190,7 @@
        NULL, \
        NULL, \
        "ifaddr",       /* 9 M_IFADDR */ \
-       "soopts",       /* 10 M_SOOPTS */ \
+       NULL, \
        "sysctl",       /* 11 M_SYSCTL */ \
        "counters",     /* 12 M_COUNTERS */ \
        NULL, \
@@ -210,7 +206,7 @@
        "NFS mount",    /* 23 M_NFSMNT */ \
        "log",          /* 24 M_LOG */ \
        "vnodes",       /* 25 M_VNODE */ \
-       "namecache",    /* 26 M_CACHE */ \
+       NULL, \
        "UFS quota",    /* 27 M_DQUOT */ \
        "UFS mount",    /* 28 M_UFSMNT */ \
        "shm",          /* 29 M_SHM */ \
@@ -222,12 +218,12 @@
        NULL,   /* 35 */ \
        NULL,   /* 36 */ \
        NULL,   /* 37 */ \
-       "file",         /* 38 M_FILE */ \
+       NULL, \
        "file desc",    /* 39 M_FILEDESC */ \
        "sigio",        /* 40 M_SIGIO */ \
        "proc",         /* 41 M_PROC */ \
        "subproc",      /* 42 M_SUBPROC */ \
-       "VFS cluster",  /* 43 M_VCLUSTER */ \
+       NULL, \
        NULL, \
        NULL, \
        "MFS node",     /* 46 M_MFSNODE */ \
@@ -285,10 +281,7 @@
        "crypto data",  /* 108 M_CRYPTO_DATA */ \
        NULL, \
        "IPsec creds",  /* 110 M_CREDENTIALS */ \
-       NULL, \
-       NULL, \
-       NULL, \
-       "emuldata",     /* 114 M_EMULDATA */ \
+       NULL, NULL, NULL, NULL, \
        NULL, NULL, NULL, NULL, \
        NULL, NULL, NULL, NULL, \
        "ip6_options",  /* 123 M_IP6OPT */ \