Staticize some malloc M_ instances.

12 files changed, 12 insertions, 12 deletions

diff --git a/sys/kern/kern_acl.c b/sys/kern/kern_acl.c
index 3c9eb6e..0e9fc40 100644
--- a/sys/kern/kern_acl.c
+++ b/sys/kern/kern_acl.c
@@ -46,7 +46,7 @@
 #include <sys/stat.h>
 #include <sys/acl.h>
 
-MALLOC_DEFINE(M_ACL, "acl", "access control list");
+static MALLOC_DEFINE(M_ACL, "acl", "access control list");
 
 static int	vacl_set_acl(struct proc *p, struct vnode *vp, acl_type_t type,
 	    struct acl *aclp);
diff --git a/sys/kern/kern_conf.c b/sys/kern/kern_conf.c
index c838f17..8c20321 100644
--- a/sys/kern/kern_conf.c
+++ b/sys/kern/kern_conf.c
@@ -49,7 +49,7 @@
 
 struct cdevsw 	*cdevsw[NUMCDEVSW];
 
-MALLOC_DEFINE(M_DEVT, "dev_t", "dev_t storage");
+static MALLOC_DEFINE(M_DEVT, "dev_t", "dev_t storage");
 
 /*
  * This is the number of hash-buckets.  Experiements with 'real-life'
diff --git a/sys/kern/kern_module.c b/sys/kern/kern_module.c
index 46c3d14..aa9ecb6 100644
--- a/sys/kern/kern_module.c
+++ b/sys/kern/kern_module.c
@@ -37,7 +37,7 @@
 #include <sys/linker.h>
 #include <sys/proc.h>
 
-MALLOC_DEFINE(M_MODULE, "module", "module data structures");
+static MALLOC_DEFINE(M_MODULE, "module", "module data structures");
 
 typedef TAILQ_HEAD(, module) modulelist_t;
 struct module {
diff --git a/sys/kern/subr_acl_posix1e.c b/sys/kern/subr_acl_posix1e.c
index 3c9eb6e..0e9fc40 100644
--- a/sys/kern/subr_acl_posix1e.c
+++ b/sys/kern/subr_acl_posix1e.c
@@ -46,7 +46,7 @@
 #include <sys/stat.h>
 #include <sys/acl.h>
 
-MALLOC_DEFINE(M_ACL, "acl", "access control list");
+static MALLOC_DEFINE(M_ACL, "acl", "access control list");
 
 static int	vacl_set_acl(struct proc *p, struct vnode *vp, acl_type_t type,
 	    struct acl *aclp);
diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c
index 35f3c97..a89048a 100644
--- a/sys/kern/subr_bus.c
+++ b/sys/kern/subr_bus.c
@@ -41,7 +41,7 @@
 #include <sys/rman.h>
 #include <machine/stdarg.h>	/* for device_printf() */
 
-MALLOC_DEFINE(M_BUS, "bus", "Bus data structures");
+static MALLOC_DEFINE(M_BUS, "bus", "Bus data structures");
 
 #ifdef BUS_DEBUG
 
diff --git a/sys/kern/subr_disk.c b/sys/kern/subr_disk.c
index 325038c..0b98fea 100644
--- a/sys/kern/subr_disk.c
+++ b/sys/kern/subr_disk.c
@@ -22,7 +22,7 @@
 #include <machine/md_var.h>
 #include <sys/ctype.h>
 
-MALLOC_DEFINE(M_DISK, "disk", "disk data");
+static MALLOC_DEFINE(M_DISK, "disk", "disk data");
 
 static d_strategy_t diskstrategy;
 static d_open_t diskopen;
diff --git a/sys/kern/subr_eventhandler.c b/sys/kern/subr_eventhandler.c
index e077dff..417d73e 100644
--- a/sys/kern/subr_eventhandler.c
+++ b/sys/kern/subr_eventhandler.c
@@ -32,7 +32,7 @@
 #include <sys/systm.h>
 #include <sys/eventhandler.h>
 
-MALLOC_DEFINE(M_EVENTHANDLER, "eventhandler", "Event handler records");
+static MALLOC_DEFINE(M_EVENTHANDLER, "eventhandler", "Event handler records");
 
 /* List of 'slow' lists */
 static TAILQ_HEAD(, eventhandler_list)	eventhandler_lists;
diff --git a/sys/kern/subr_taskqueue.c b/sys/kern/subr_taskqueue.c
index ba25c7f..5afda76 100644
--- a/sys/kern/subr_taskqueue.c
+++ b/sys/kern/subr_taskqueue.c
@@ -36,7 +36,7 @@
 #include <sys/ipl.h>
 #include <sys/malloc.h>
 
-MALLOC_DEFINE(M_TASKQUEUE, "taskqueue", "Task Queues");
+static MALLOC_DEFINE(M_TASKQUEUE, "taskqueue", "Task Queues");
 
 static STAILQ_HEAD(taskqueue_list, taskqueue) taskqueue_queues;
 
diff --git a/sys/kern/tty_pty.c b/sys/kern/tty_pty.c
index 507a5aa..58af6c6 100644
--- a/sys/kern/tty_pty.c
+++ b/sys/kern/tty_pty.c
@@ -54,7 +54,7 @@
 #include <sys/signalvar.h>
 #include <sys/malloc.h>
 
-MALLOC_DEFINE(M_PTY, "ptys", "pty data structures");
+static MALLOC_DEFINE(M_PTY, "ptys", "pty data structures");
 
 static void ptsstart __P((struct tty *tp));
 static void ptsstop __P((struct tty *tp, int rw));
diff --git a/sys/kern/tty_snoop.c b/sys/kern/tty_snoop.c
index 648a6a5..9950513 100644
--- a/sys/kern/tty_snoop.c
+++ b/sys/kern/tty_snoop.c
@@ -61,7 +61,7 @@ static struct cdevsw snp_cdevsw = {
 #define MIN(a,b) (((a)<(b))?(a):(b))
 #endif
 
-MALLOC_DEFINE(M_SNP, "snp", "Snoop device data");
+static MALLOC_DEFINE(M_SNP, "snp", "Snoop device data");
 
 static struct tty	*snpdevtotty __P((dev_t dev));
 static int		snp_detach __P((struct snoop *snp));
diff --git a/sys/kern/vfs_acl.c b/sys/kern/vfs_acl.c
index 3c9eb6e..0e9fc40 100644
--- a/sys/kern/vfs_acl.c
+++ b/sys/kern/vfs_acl.c
@@ -46,7 +46,7 @@
 #include <sys/stat.h>
 #include <sys/acl.h>
 
-MALLOC_DEFINE(M_ACL, "acl", "access control list");
+static MALLOC_DEFINE(M_ACL, "acl", "access control list");
 
 static int	vacl_set_acl(struct proc *p, struct vnode *vp, acl_type_t type,
 	    struct acl *aclp);
diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c
index b405d14..6657523 100644
--- a/sys/kern/vfs_cache.c
+++ b/sys/kern/vfs_cache.c
@@ -130,7 +130,7 @@ SYSCTL_OPAQUE(_vfs_cache, OID_AUTO, nchstats, CTLFLAG_RD, &nchstats,
 
 static void cache_zap __P((struct namecache *ncp));
 
-MALLOC_DEFINE(M_VFSCACHE, "vfscache", "VFS name cache entries");
+static MALLOC_DEFINE(M_VFSCACHE, "vfscache", "VFS name cache entries");
 
 /*
  * Flags in namecache.nc_flag