summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Pieuchot <mpi@cvs.openbsd.org>2015-08-24 15:33:50 +0000
committerMartin Pieuchot <mpi@cvs.openbsd.org>2015-08-24 15:33:50 +0000
commit74ff16ac33d7a3b0350b6fb15dbe99fe5dc2c1c2 (patch)
tree9c4497d2951cd69b88692d3900df5486491f82ee
parentc344b72ed129e83aacaa5d43aec7f0b3b2e7e316 (diff)
Rename M_RTABLE bucket into "rtable" to match the code and kill unused
M_BWMETER. ok mikeb@
-rw-r--r--share/man/man9/malloc.96
-rw-r--r--sys/sys/malloc.h9
2 files changed, 6 insertions, 9 deletions
diff --git a/share/man/man9/malloc.9 b/share/man/man9/malloc.9
index e45757d590b..a8f9cab088e 100644
--- a/share/man/man9/malloc.9
+++ b/share/man/man9/malloc.9
@@ -1,4 +1,4 @@
-.\" $OpenBSD: malloc.9,v 1.61 2014/11/19 05:42:26 deraadt Exp $
+.\" $OpenBSD: malloc.9,v 1.62 2015/08/24 15:33:49 mpi 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: November 19 2014 $
+.Dd $Mdocdate: August 24 2015 $
.Dt MALLOC 9
.Os
.Sh NAME
@@ -304,8 +304,6 @@ NTFS vrun storage.
.It Dv M_KEVENT
.Xr kqueue 2
data structures.
-.It Dv M_BWMETER
-Multicast upcall bandwidth meters.
.It Dv M_UDFMOUNT
UDF mount structures.
.It Dv M_UDFFENTRY
diff --git a/sys/sys/malloc.h b/sys/sys/malloc.h
index 6943a86c773..1690bff2842 100644
--- a/sys/sys/malloc.h
+++ b/sys/sys/malloc.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: malloc.h,v 1.111 2014/07/12 18:43:32 tedu Exp $ */
+/* $OpenBSD: malloc.h,v 1.112 2015/08/24 15:33:49 mpi Exp $ */
/* $NetBSD: malloc.h,v 1.39 1998/07/12 19:52:01 augustss Exp $ */
/*
@@ -169,8 +169,7 @@
#define M_KEVENT 137 /* kqueue related */
/* 138 free */
-
-#define M_BWMETER 139 /* Multicast upcall bw meters */
+ /* 139 free */
#define M_UDFMOUNT 140 /* UDF mount */
#define M_UDFFENTRY 141 /* UDF file entry */
@@ -190,7 +189,7 @@
"devbuf", /* 2 M_DEVBUF */ \
"debug", /* 3 M_DEBUG */ \
"pcb", /* 4 M_PCB */ \
- "routetbl", /* 5 M_RTABLE */ \
+ "rtable", /* 5 M_RTABLE */ \
NULL, /* 6 */ \
"fragtbl", /* 7 M_FTABLE */ \
NULL, \
@@ -308,7 +307,7 @@
"NTFS vrun", /* 136 M_NTFSRUN */ \
"kqueue", /* 137 M_KEVENT */ \
NULL, /* 138 free */ \
- "bwmeter", /* 139 M_BWMETER */ \
+ "NULL", \
"UDF mount", /* 140 M_UDFMOUNT */ \
"UDF file entry", /* 141 M_UDFFENTRY */ \
"UDF file id", /* 142 M_UDFFID */ \