diff options
| author | jhb <jhb@FreeBSD.org> | 2000-10-20 07:29:16 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2000-10-20 07:29:16 +0000 |
| commit | 6231c1d6d8c41ee9798a59abafdd7dfd973dd0e5 (patch) | |
| tree | 9284b163edfe7950e489e002921f7ff9b0316578 /sys/kern | |
| parent | a08bf2eb0aa3b27be98171ac780d1e0bb0d9238e (diff) | |
| download | FreeBSD-src-6231c1d6d8c41ee9798a59abafdd7dfd973dd0e5.zip FreeBSD-src-6231c1d6d8c41ee9798a59abafdd7dfd973dd0e5.tar.gz | |
- machine/mutex.h -> sys/mutex.h
- Use MUTEX_DECLARE() and MTX_COLD for the malloc_mtx mutex
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/kern_malloc.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c index 9219428..a2e77fd 100644 --- a/sys/kern/kern_malloc.c +++ b/sys/kern/kern_malloc.c @@ -41,11 +41,10 @@ #include <sys/kernel.h> #include <sys/malloc.h> #include <sys/mbuf.h> +#include <sys/mutex.h> #include <sys/vmmeter.h> #include <sys/lock.h> -#include <machine/mutex.h> - #include <vm/vm.h> #include <vm/vm_param.h> #include <vm/vm_kern.h> @@ -75,7 +74,7 @@ static struct kmemusage *kmemusage; static char *kmembase; static char *kmemlimit; -struct mtx malloc_mtx; +MUTEX_DECLARE(static, malloc_mtx); u_int vm_kmem_size; @@ -437,7 +436,7 @@ kmeminit(dummy) #error "kmeminit: MAXALLOCSAVE too small" #endif - mtx_init(&malloc_mtx, "malloc", MTX_DEF); + mtx_init(&malloc_mtx, "malloc", MTX_DEF | MTX_COLD); /* * Try to auto-tune the kernel memory size, so that it is |
