17 files changed, 17 insertions, 17 deletions

diff --git a/sys/dev/led/led.c b/sys/dev/led/led.c
index 03d7e6cb6886..49e787b98b53 100644
--- a/sys/dev/led/led.c
+++ b/sys/dev/led/led.c
@@ -42,7 +42,7 @@ static struct sx led_sx;
 static LIST_HEAD(, ledsc) led_list = LIST_HEAD_INITIALIZER(&led_list);
 static struct callout led_ch;
 
-MALLOC_DEFINE(M_LED, "LED", "LED driver");
+static MALLOC_DEFINE(M_LED, "LED", "LED driver");
 
 static void
 led_timeout(void *p)
diff --git a/sys/dev/ray/if_ray.c b/sys/dev/ray/if_ray.c
index 35a18158a37d..1dc21f30bdc8 100644
--- a/sys/dev/ray/if_ray.c
+++ b/sys/dev/ray/if_ray.c
@@ -275,6 +275,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/ray/if_raydbg.h>
 #include <dev/ray/if_rayvar.h>
 
+static MALLOC_DEFINE(M_RAYCOM, "raycom", "Raylink command queue entry");
 /*
  * Prototyping
  */
diff --git a/sys/dev/ray/if_rayvar.h b/sys/dev/ray/if_rayvar.h
index 0a91859ebf67..fc3aae2839f3 100644
--- a/sys/dev/ray/if_rayvar.h
+++ b/sys/dev/ray/if_rayvar.h
@@ -111,8 +111,6 @@ struct ray_softc {
  * Command queue definitions
  */
 typedef void (*ray_comqfn_t)(struct ray_softc *sc, struct ray_comq_entry *com);
-MALLOC_DECLARE(M_RAYCOM);
-MALLOC_DEFINE(M_RAYCOM, "raycom", "Raylink command queue entry");
 struct ray_comq_entry {
 	TAILQ_ENTRY(ray_comq_entry) c_chain;	/* Tail queue.		*/
 	ray_comqfn_t	c_function;		/* Function to call */
diff --git a/sys/fs/hpfs/hpfs_hash.c b/sys/fs/hpfs/hpfs_hash.c
index 186256faf672..aa410a8759a8 100644
--- a/sys/fs/hpfs/hpfs_hash.c
+++ b/sys/fs/hpfs/hpfs_hash.c
@@ -42,7 +42,7 @@
 
 #include <fs/hpfs/hpfs.h>
 
-MALLOC_DEFINE(M_HPFSHASH, "HPFS hash", "HPFS node hash tables");
+static MALLOC_DEFINE(M_HPFSHASH, "HPFS hash", "HPFS node hash tables");
 
 /*
  * Structures associated with hpfsnode cacheing.
diff --git a/sys/fs/udf/udf_vfsops.c b/sys/fs/udf/udf_vfsops.c
index ef3ae3f18efd..519d41a8a3b2 100644
--- a/sys/fs/udf/udf_vfsops.c
+++ b/sys/fs/udf/udf_vfsops.c
@@ -99,7 +99,7 @@
 #include <fs/udf/udf.h>
 #include <fs/udf/udf_mount.h>
 
-MALLOC_DEFINE(M_UDFMOUNT, "UDF mount", "UDF mount structure");
+static MALLOC_DEFINE(M_UDFMOUNT, "UDF mount", "UDF mount structure");
 MALLOC_DEFINE(M_UDFFENTRY, "UDF fentry", "UDF file entry structure");
 
 struct iconv_functions *udf_iconv = NULL;
diff --git a/sys/i386/i386/io_apic.c b/sys/i386/i386/io_apic.c
index 18923e2621d5..1fae38708e2b 100644
--- a/sys/i386/i386/io_apic.c
+++ b/sys/i386/i386/io_apic.c
@@ -65,7 +65,7 @@ __FBSDID("$FreeBSD$");
 
 #define	TODO		printf("%s: not implemented!\n", __func__)
 
-MALLOC_DEFINE(M_IOAPIC, "I/O APIC", "I/O APIC structures");
+static MALLOC_DEFINE(M_IOAPIC, "I/O APIC", "I/O APIC structures");
 
 /*
  * New interrupt support code..
diff --git a/sys/i386/i386/mptable.c b/sys/i386/i386/mptable.c
index d2b0c2ca3a6c..1cc2573d2b7f 100644
--- a/sys/i386/i386/mptable.c
+++ b/sys/i386/i386/mptable.c
@@ -147,7 +147,7 @@ static bus_datum *busses;
 static int mptable_nioapics, mptable_nbusses, mptable_maxbusid;
 static int pci0 = -1;
 
-MALLOC_DEFINE(M_MPTABLE, "MP Table", "MP Table Items");
+static MALLOC_DEFINE(M_MPTABLE, "MP Table", "MP Table Items");
 
 static enum intr_polarity conforming_polarity(u_char src_bus,
 	    u_char src_bus_irq);
diff --git a/sys/i386/pci/pci_pir.c b/sys/i386/pci/pci_pir.c
index ab6e17e1ffb8..89e83562624c 100644
--- a/sys/i386/pci/pci_pir.c
+++ b/sys/i386/pci/pci_pir.c
@@ -99,7 +99,7 @@ static uint8_t	pci_pir_search_irq(int bus, int device, int pin);
 static int	pci_pir_valid_irq(struct pci_link *pci_link, int irq);
 static void	pci_pir_walk_table(pir_entry_handler *handler, void *arg);
 
-MALLOC_DEFINE(M_PIR, "$PIR", "$PIR structures");
+static MALLOC_DEFINE(M_PIR, "$PIR", "$PIR structures");
 
 static struct PIR_table *pci_route_table;
 static device_t pir_device;
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);
diff --git a/sys/net/if_clone.c b/sys/net/if_clone.c
index 622afd501423..389896dd0b24 100644
--- a/sys/net/if_clone.c
+++ b/sys/net/if_clone.c
@@ -100,7 +100,7 @@ LIST_HEAD(, if_clone)	if_cloners = LIST_HEAD_INITIALIZER(if_cloners);
 		}							\
 	} while (0)
 
-MALLOC_DEFINE(M_CLONE, "clone", "interface cloning framework");
+static MALLOC_DEFINE(M_CLONE, "clone", "interface cloning framework");
 
 void
 if_clone_init(void)