All the references to the M_ALIGN and MH_ALIGN macros are gone.

Time to bring them behind the shed and free them. Use m_align() instead.
OK mpi@ henning@ florian@ kn@

2 files changed, 3 insertions, 37 deletions

diff --git a/share/man/man9/mbuf.9 b/share/man/man9/mbuf.9
index ab1f6d7393f..6f798945437 100644
--- a/share/man/man9/mbuf.9
+++ b/share/man/man9/mbuf.9
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: mbuf.9,v 1.117 2018/11/30 11:58:47 claudio Exp $
+.\"     $OpenBSD: mbuf.9,v 1.118 2018/12/07 08:37:24 claudio Exp $
 .\"
 .\" Copyright (c) 2001 Jean-Jacques Bernard-Gundol <jjbg@openbsd.org>
 .\" All rights reserved.
@@ -25,7 +25,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: November 30 2018 $
+.Dd $Mdocdate: December 7 2018 $
 .Dt MGET 9
 .Os
 .Sh NAME
@@ -61,8 +61,6 @@
 .Nm MCLGETI ,
 .Nm MEXTADD ,
 .Nm m_align ,
-.Nm M_ALIGN ,
-.Nm MH_ALIGN ,
 .Nm M_READONLY ,
 .Nm m_leadingspace ,
 .Nm m_trailingspace ,
@@ -133,8 +131,6 @@
 "void (*free)(caddr_t, u_int, void *)" "void *arg"
 .Ft void
 .Fn m_align "struct mbuf *m" "int len"
-.Fn M_ALIGN "struct mbuf *m" "int len"
-.Fn MH_ALIGN "struct mbuf *m" "int len"
 .Fn M_READONLY "struct mbuf *m"
 .Ft int
 .Fn m_leadingspace "struct mbuf *m"
@@ -757,25 +753,6 @@ pointer of the newly allocated mbuf
 to an object of the specified size
 .Fa len
 at the end of this mbuf data area, longword aligned.
-.It Fn M_ALIGN "struct mbuf *m" "int len"
-Set the
-.Fa m_data
-pointer of the newly allocated mbuf with
-.Fn m_get
-or
-.Fn MGET
-pointed to by
-.Fa m
-to an object of the specified size
-.Fa len
-at the end of the mbuf, longword aligned.
-.It Fn MH_ALIGN "m" "len"
-Same as
-.Fn M_ALIGN
-except it is for an mbuf allocated with
-.Fn m_gethdr
-or
-.Fn MGETHDR .
 .It Fn M_READONLY "struct mbuf *m"
 Check if the data of the mbuf pointed to by
 .Fa m
diff --git a/sys/sys/mbuf.h b/sys/sys/mbuf.h
index 5135942bbfe..c6c5853863d 100644
--- a/sys/sys/mbuf.h
+++ b/sys/sys/mbuf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mbuf.h,v 1.240 2018/11/12 07:45:52 claudio Exp $	*/
+/*	$OpenBSD: mbuf.h,v 1.241 2018/12/07 08:37:24 claudio Exp $	*/
 /*	$NetBSD: mbuf.h,v 1.19 1996/02/09 18:25:14 christos Exp $	*/
 
 /*
@@ -345,17 +345,6 @@ u_int mextfree_register(void (*)(caddr_t, u_int, void *));
 } while (/* CONSTCOND */ 0)
 
 /*
- * Set the m_data pointer of a newly-allocated mbuf (m_get/MGET) to place
- * an object of the specified size at the end of the mbuf, longword aligned.
- */
-#define	M_ALIGN(m, len) 	m_align((m), (len))
-/*
- * As above, for mbufs allocated with m_gethdr/MGETHDR
- * or initialized by M_MOVE_PKTHDR.
- */
-#define	MH_ALIGN(m, len)	m_align((m), (len))
-
-/*
  * Determine if an mbuf's data area is read-only. This is true for
  * non-cluster external storage and for clusters that are being
  * referenced by more than one mbuf.