diff options
author | ed <ed@FreeBSD.org> | 2011-11-07 06:44:47 +0000 |
---|---|---|
committer | ed <ed@FreeBSD.org> | 2011-11-07 06:44:47 +0000 |
commit | e97eae1577f10887cddd14c0c954b3ddcf507bd6 (patch) | |
tree | 3278fb8afc568f22cc5eda0e74926191fc1857df /sys/kern | |
parent | dcf961c021321caf2c6fda15125c85b82ec9ff04 (diff) | |
download | FreeBSD-src-e97eae1577f10887cddd14c0c954b3ddcf507bd6.zip FreeBSD-src-e97eae1577f10887cddd14c0c954b3ddcf507bd6.tar.gz |
Mark MALLOC_DEFINEs static that have no corresponding MALLOC_DECLAREs.
This means that their use is restricted to a single C file.
Diffstat (limited to 'sys/kern')
-rw-r--r-- | sys/kern/kern_dtrace.c | 2 | ||||
-rw-r--r-- | sys/kern/kern_fail.c | 2 | ||||
-rw-r--r-- | sys/kern/kern_jail.c | 2 | ||||
-rw-r--r-- | sys/kern/kern_lockf.c | 2 | ||||
-rw-r--r-- | sys/kern/kern_rctl.c | 2 | ||||
-rw-r--r-- | sys/kern/kern_timeout.c | 2 | ||||
-rw-r--r-- | sys/kern/subr_pcpu.c | 2 | ||||
-rw-r--r-- | sys/kern/subr_witness.c | 2 | ||||
-rw-r--r-- | sys/kern/vfs_mount.c | 2 |
9 files changed, 9 insertions, 9 deletions
diff --git a/sys/kern/kern_dtrace.c b/sys/kern/kern_dtrace.c index 2082fed..5582fb9 100644 --- a/sys/kern/kern_dtrace.c +++ b/sys/kern/kern_dtrace.c @@ -45,7 +45,7 @@ __FBSDID("$FreeBSD$"); FEATURE(kdtrace_hooks, "Kernel DTrace hooks which are required to load DTrace kernel modules"); -MALLOC_DEFINE(M_KDTRACE, "kdtrace", "DTrace hooks"); +static MALLOC_DEFINE(M_KDTRACE, "kdtrace", "DTrace hooks"); /* Return the DTrace process data size compiled in the kernel hooks. */ size_t diff --git a/sys/kern/kern_fail.c b/sys/kern/kern_fail.c index f192471..85d81e8 100644 --- a/sys/kern/kern_fail.c +++ b/sys/kern/kern_fail.c @@ -69,7 +69,7 @@ __FBSDID("$FreeBSD$"); ILOG_DEFINE_FOR_FILE(L_ISI_FAIL_POINT, L_ILOG, fail_point); #endif -MALLOC_DEFINE(M_FAIL_POINT, "Fail Points", "fail points system"); +static MALLOC_DEFINE(M_FAIL_POINT, "Fail Points", "fail points system"); #define fp_free(ptr) free(ptr, M_FAIL_POINT) #define fp_malloc(size, flags) malloc((size), M_FAIL_POINT, (flags)) diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c index 37a2c59..59bae44 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -78,7 +78,7 @@ __FBSDID("$FreeBSD$"); #define DEFAULT_HOSTUUID "00000000-0000-0000-0000-000000000000" MALLOC_DEFINE(M_PRISON, "prison", "Prison structures"); -MALLOC_DEFINE(M_PRISON_RACCT, "prison_racct", "Prison racct structures"); +static MALLOC_DEFINE(M_PRISON_RACCT, "prison_racct", "Prison racct structures"); /* Keep struct prison prison0 and some code in kern_jail_set() readable. */ #ifdef INET diff --git a/sys/kern/kern_lockf.c b/sys/kern/kern_lockf.c index ddf6846..6d6dc51 100644 --- a/sys/kern/kern_lockf.c +++ b/sys/kern/kern_lockf.c @@ -90,7 +90,7 @@ static int lockf_debug = 0; /* control debug output */ SYSCTL_INT(_debug, OID_AUTO, lockf_debug, CTLFLAG_RW, &lockf_debug, 0, ""); #endif -MALLOC_DEFINE(M_LOCKF, "lockf", "Byte-range locking structures"); +static MALLOC_DEFINE(M_LOCKF, "lockf", "Byte-range locking structures"); struct owner_edge; struct owner_vertex; diff --git a/sys/kern/kern_rctl.c b/sys/kern/kern_rctl.c index ad31456..aaea7d5 100644 --- a/sys/kern/kern_rctl.c +++ b/sys/kern/kern_rctl.c @@ -169,7 +169,7 @@ RW_SYSINIT(rctl_lock, &rctl_lock, "RCTL lock"); static int rctl_rule_fully_specified(const struct rctl_rule *rule); static void rctl_rule_to_sbuf(struct sbuf *sb, const struct rctl_rule *rule); -MALLOC_DEFINE(M_RCTL, "rctl", "Resource Limits"); +static MALLOC_DEFINE(M_RCTL, "rctl", "Resource Limits"); static const char * rctl_subject_type_name(int subject) diff --git a/sys/kern/kern_timeout.c b/sys/kern/kern_timeout.c index b820bd9..5e1d4f3 100644 --- a/sys/kern/kern_timeout.c +++ b/sys/kern/kern_timeout.c @@ -156,7 +156,7 @@ struct callout_cpu cc_cpu; static int timeout_cpu; void (*callout_new_inserted)(int cpu, int ticks) = NULL; -MALLOC_DEFINE(M_CALLOUT, "callout", "Callout datastructures"); +static MALLOC_DEFINE(M_CALLOUT, "callout", "Callout datastructures"); /** * Locked by cc_lock: diff --git a/sys/kern/subr_pcpu.c b/sys/kern/subr_pcpu.c index ba76bb2..505a4df 100644 --- a/sys/kern/subr_pcpu.c +++ b/sys/kern/subr_pcpu.c @@ -61,7 +61,7 @@ __FBSDID("$FreeBSD$"); #include <sys/sx.h> #include <ddb/ddb.h> -MALLOC_DEFINE(M_PCPU, "Per-cpu", "Per-cpu resource accouting."); +static MALLOC_DEFINE(M_PCPU, "Per-cpu", "Per-cpu resource accouting."); struct dpcpu_free { uintptr_t df_start; diff --git a/sys/kern/subr_witness.c b/sys/kern/subr_witness.c index a4cf5a2..ab0a1b3 100644 --- a/sys/kern/subr_witness.c +++ b/sys/kern/subr_witness.c @@ -184,7 +184,7 @@ __FBSDID("$FreeBSD$"); #define WITNESS_INDEX_ASSERT(i) \ MPASS((i) > 0 && (i) <= w_max_used_index && (i) < WITNESS_COUNT) -MALLOC_DEFINE(M_WITNESS, "Witness", "Witness"); +static MALLOC_DEFINE(M_WITNESS, "Witness", "Witness"); /* * Lock instances. A lock instance is the data associated with a lock while diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index e8b89e5..545a183 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -79,7 +79,7 @@ SYSCTL_INT(_vfs, OID_AUTO, usermount, CTLFLAG_RW, &usermount, 0, "Unprivileged users may mount and unmount file systems"); MALLOC_DEFINE(M_MOUNT, "mount", "vfs mount structure"); -MALLOC_DEFINE(M_VNODE_MARKER, "vnodemarker", "vnode marker"); +static MALLOC_DEFINE(M_VNODE_MARKER, "vnodemarker", "vnode marker"); static uma_zone_t mount_zone; /* List of mounted filesystems. */ |