ok?

Index: share/man/man9/mbuf.9
===================================================================
RCS file: /cvs/src/share/man/man9/mbuf.9,v
retrieving revision 1.103
diff -u -p -r1.103 mbuf.9
--- share/man/man9/mbuf.9       13 Sep 2016 19:56:55 -0000      1.103
+++ share/man/man9/mbuf.9       13 Sep 2016 23:54:46 -0000
@@ -29,7 +29,6 @@
 .Dt MGET 9
 .Os
 .Sh NAME
-.Nm m_copym2 ,
 .Nm m_copym ,
 .Nm m_free ,
 .Nm m_get ,
@@ -70,8 +69,6 @@
 .Sh SYNOPSIS
 .In sys/mbuf.h
 .Ft struct mbuf *
-.Fn m_copym2 "struct mbuf *m" "int off" "int len" "int wait"
-.Ft struct mbuf *
 .Fn m_copym "struct mbuf *m" "int off" "int len" "int wait"
 .Ft struct mbuf *
 .Fn m_free "struct mbuf *m"
@@ -437,12 +434,6 @@ The
 parameter can be M_WAIT or
 M_DONTWAIT.
 It does not copy clusters, it just increases their reference count.
-.It Fn m_copym2 "struct mbuf *m" "int off" "int len" "int wait"
-The same as
-.Fn m_copym
-except that it copies cluster mbufs, whereas
-.Fn m_copym
-just increases the reference count of the clusters.
 .It Fn m_free "struct mbuf *m"
 Free the mbuf pointed to by
 .Fa m .
Index: sys/arch/amd64/conf/GENERIC
===================================================================
RCS file: /cvs/src/sys/arch/amd64/conf/GENERIC,v
retrieving revision 1.433
diff -u -p -r1.433 GENERIC
--- sys/arch/amd64/conf/GENERIC 12 Sep 2016 08:28:44 -0000      1.433
+++ sys/arch/amd64/conf/GENERIC 13 Sep 2016 23:54:46 -0000
@@ -27,6 +27,8 @@ option                HIBERNATE       # Hibernate support
 
 config         bsd     swap generic
 
+makeoption DEBUG="-g"
+
 mainbus0 at root
 
 bios0  at mainbus?
Index: sys/kern/uipc_mbuf.c
===================================================================
RCS file: /cvs/src/sys/kern/uipc_mbuf.c,v
retrieving revision 1.228
diff -u -p -r1.228 uipc_mbuf.c
--- sys/kern/uipc_mbuf.c        13 Sep 2016 19:56:55 -0000      1.228
+++ sys/kern/uipc_mbuf.c        13 Sep 2016 23:54:47 -0000
@@ -576,16 +576,6 @@ m_copym(struct mbuf *m, int off, int len
        return m_copym0(m, off, len, wait, 0);  /* shallow copy on M_EXT */
 }
 
-/*
- * m_copym2() is like m_copym(), except it COPIES cluster mbufs, instead
- * of merely bumping the reference count.
- */
-struct mbuf *
-m_copym2(struct mbuf *m, int off, int len, int wait)
-{
-       return m_copym0(m, off, len, wait, 1);  /* deep copy */
-}
-
 struct mbuf *
 m_copym0(struct mbuf *m0, int off, int len, int wait, int deep)
 {
Index: sys/sys/mbuf.h
===================================================================
RCS file: /cvs/src/sys/sys/mbuf.h,v
retrieving revision 1.218
diff -u -p -r1.218 mbuf.h
--- sys/sys/mbuf.h      13 Sep 2016 19:56:55 -0000      1.218
+++ sys/sys/mbuf.h      13 Sep 2016 23:54:47 -0000
@@ -423,7 +423,6 @@ extern      int max_protohdr;               /* largest pro
 extern int max_hdr;                    /* largest link+protocol header */
 
 void   mbinit(void);
-struct mbuf *m_copym2(struct mbuf *, int, int, int);
 struct mbuf *m_copym(struct mbuf *, int, int, int);
 struct mbuf *m_free(struct mbuf *);
 struct mbuf *m_get(int, int);

Reply via email to