diff options
| author | bde <bde@FreeBSD.org> | 1997-09-16 13:52:04 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1997-09-16 13:52:04 +0000 |
| commit | 64d0bec2a826107aa4006f6e9dc8ec97d812eded (patch) | |
| tree | 6d11e78230701e0aa363f81df4cee42e9fdaf56d /sys/kern/kern_malloc.c | |
| parent | 1062c10a868b291bcfcaf2a5ea696b6bbb4acb37 (diff) | |
| download | FreeBSD-src-64d0bec2a826107aa4006f6e9dc8ec97d812eded.zip FreeBSD-src-64d0bec2a826107aa4006f6e9dc8ec97d812eded.tar.gz | |
Fixed staticization. buckets[] was staticized but was still declared
extern in <sys/malloc.h> and it should not have been staticized for
the !(KMEMSTATS || DIAGNOSTIC) case.
Fixed the !(KMEMSTATS || DIAGNOSTIC) case. The MALLOC() and FREE()
macros are evil, but code generally doesn't allow for this and some code
involving else clauses did not compile.
Finished staticization.
Diffstat (limited to 'sys/kern/kern_malloc.c')
| -rw-r--r-- | sys/kern/kern_malloc.c | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c index ed2c7c6..6964dde 100644 --- a/sys/kern/kern_malloc.c +++ b/sys/kern/kern_malloc.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)kern_malloc.c 8.3 (Berkeley) 1/4/94 - * $Id: kern_malloc.c,v 1.28 1997/08/05 00:01:23 dyson Exp $ + * $Id: kern_malloc.c,v 1.29 1997/09/02 20:05:39 bde Exp $ */ #include <sys/param.h> @@ -52,11 +52,22 @@ static void kmeminit __P((void *)); SYSINIT(kmem, SI_SUB_KMEM, SI_ORDER_FIRST, kmeminit, NULL) -static struct kmembuckets bucket[MINBUCKET + 16]; -struct kmemstats kmemstats[M_LAST]; -struct kmemusage *kmemusage; -char *kmembase, *kmemlimit; -char *memname[] = INITKMEMNAMES; +#if defined(KMEMSTATS) || defined(DIAGNOSTIC) +#define MAYBE_STATIC static +#else +#define MAYBE_STATIC +#endif + +MAYBE_STATIC struct kmembuckets bucket[MINBUCKET + 16]; +#ifdef KMEMSTATS +static struct kmemstats kmemstats[M_LAST]; +#endif +MAYBE_STATIC struct kmemusage *kmemusage; +MAYBE_STATIC char *kmembase; +static char *kmemlimit; +#if defined(KMEMSTATS) || defined(DIAGNOSTIC) +static char *memname[] = INITKMEMNAMES; +#endif #ifdef DIAGNOSTIC /* |
