8 files changed, 9 insertions, 8 deletions

diff --git a/sys/kern/kern_environment.c b/sys/kern/kern_environment.c
index 15344819311c..bb26b619bf14 100644
--- a/sys/kern/kern_environment.c
+++ b/sys/kern/kern_environment.c
@@ -55,7 +55,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/libkern.h>
 #include <sys/kenv.h>
 
-MALLOC_DEFINE(M_KENV, "kenv", "kernel environment");
+static MALLOC_DEFINE(M_KENV, "kenv", "kernel environment");
 
 #define KENV_SIZE	512	/* Maximum number of environment strings */
 
diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c
index c64234157cd1..24fc00d33bcd 100644
--- a/sys/kern/kern_event.c
+++ b/sys/kern/kern_event.c
@@ -59,7 +59,8 @@ __FBSDID("$FreeBSD$");
 
 #include <vm/uma.h>
 
-MALLOC_DEFINE(M_KQUEUE, "kqueue", "memory for kqueue system");
+static MALLOC_DEFINE(M_KQUEUE, "kqueue", "memory for kqueue system");
+
 /*
  * This lock is used if multiple kq locks are required.  This possibly
  * should be made into a per proc lock.
diff --git a/sys/kern/kern_mtxpool.c b/sys/kern/kern_mtxpool.c
index 9e64a620edc1..58158b9e791d 100644
--- a/sys/kern/kern_mtxpool.c
+++ b/sys/kern/kern_mtxpool.c
@@ -56,7 +56,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h>
 
 
-MALLOC_DEFINE(M_MTXPOOL, "mtx_pool", "mutex pool");
+static MALLOC_DEFINE(M_MTXPOOL, "mtx_pool", "mutex pool");
 
 /* Pool sizes must be a power of two */
 #ifndef MTX_POOL_LOCKBUILDER_SIZE
diff --git a/sys/kern/subr_sbuf.c b/sys/kern/subr_sbuf.c
index 286cc04f278c..efa9ad7e4b73 100644
--- a/sys/kern/subr_sbuf.c
+++ b/sys/kern/subr_sbuf.c
@@ -49,7 +49,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/sbuf.h>
 
 #ifdef _KERNEL
-MALLOC_DEFINE(M_SBUF, "sbuf", "string buffers");
+static MALLOC_DEFINE(M_SBUF, "sbuf", "string buffers");
 #define	SBMALLOC(size)		malloc(size, M_SBUF, M_WAITOK)
 #define	SBFREE(buf)		free(buf, M_SBUF)
 #else /* _KERNEL */
diff --git a/sys/kern/subr_sleepqueue.c b/sys/kern/subr_sleepqueue.c
index 50430124c307..0a411472d09f 100644
--- a/sys/kern/subr_sleepqueue.c
+++ b/sys/kern/subr_sleepqueue.c
@@ -138,7 +138,7 @@ SYSCTL_UINT(_debug_sleepq, OID_AUTO, max_depth, CTLFLAG_RD, &sleepq_max_depth,
 #endif
 static struct sleepqueue_chain sleepq_chains[SC_TABLESIZE];
 
-MALLOC_DEFINE(M_SLEEPQUEUE, "sleep queues", "sleep queues");
+static MALLOC_DEFINE(M_SLEEPQUEUE, "sleep queues", "sleep queues");
 
 /*
  * Prototypes for non-exported routines.
diff --git a/sys/kern/subr_turnstile.c b/sys/kern/subr_turnstile.c
index 7eabe2101bfa..4686f78eff85 100644
--- a/sys/kern/subr_turnstile.c
+++ b/sys/kern/subr_turnstile.c
@@ -136,7 +136,7 @@ SYSCTL_UINT(_debug_turnstile, OID_AUTO, max_depth, CTLFLAG_RD,
 static struct mtx td_contested_lock;
 static struct turnstile_chain turnstile_chains[TC_TABLESIZE];
 
-MALLOC_DEFINE(M_TURNSTILE, "turnstiles", "turnstiles");
+static MALLOC_DEFINE(M_TURNSTILE, "turnstiles", "turnstiles");
 
 /*
  * Prototypes for non-exported routines.
diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c
index 0e8bb1c67b31..2f2846282b87 100644
--- a/sys/kern/uipc_mbuf.c
+++ b/sys/kern/uipc_mbuf.c
@@ -88,7 +88,7 @@ SYSCTL_INT(_kern_ipc, OID_AUTO, m_defragrandomfailures, CTLFLAG_RW,
 /*
  * Malloc-type for external ext_buf ref counts.
  */
-MALLOC_DEFINE(M_MBUF, "mbextcnt", "mbuf external ref counts");
+static MALLOC_DEFINE(M_MBUF, "mbextcnt", "mbuf external ref counts");
 
 /*
  * Allocate a given length worth of mbufs and/or clusters (whatever fits
diff --git a/sys/kern/uipc_mbuf2.c b/sys/kern/uipc_mbuf2.c
index 4b87f64b7a6d..81b2260b6bb0 100644
--- a/sys/kern/uipc_mbuf2.c
+++ b/sys/kern/uipc_mbuf2.c
@@ -76,7 +76,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/mbuf.h>
 #include <sys/mutex.h>
 
-MALLOC_DEFINE(M_PACKET_TAGS, "mbuf tags", "packet-attached information");
+static MALLOC_DEFINE(M_PACKET_TAGS, "mbuf tags", "packet-attached information");
 
 /* can't call it m_dup(), as freebsd[34] uses m_dup() with different arg */
 static struct mbuf *m_dup1(struct mbuf *, int, int, int);