diff options
| author | attilio <attilio@FreeBSD.org> | 2013-02-04 22:10:01 +0000 |
|---|---|---|
| committer | attilio <attilio@FreeBSD.org> | 2013-02-04 22:10:01 +0000 |
| commit | d3b7ec3a087fe017933d12d65a35cae1d1a00914 (patch) | |
| tree | ab3d468dc0be6c80a1fb354da0786f9b3853ac34 /sys/kern | |
| parent | 0d3b58aee00948d85d75a9d3d222deb454afc98e (diff) | |
| parent | cfd3c02e72a8574bd02f57cd649cc2a4138d83ef (diff) | |
| download | FreeBSD-src-d3b7ec3a087fe017933d12d65a35cae1d1a00914.zip FreeBSD-src-d3b7ec3a087fe017933d12d65a35cae1d1a00914.tar.gz | |
MFC
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/kern_ktr.c | 3 | ||||
| -rw-r--r-- | sys/kern/kern_malloc.c | 11 |
2 files changed, 2 insertions, 12 deletions
diff --git a/sys/kern/kern_ktr.c b/sys/kern/kern_ktr.c index 5b9d7aa..a11c76c 100644 --- a/sys/kern/kern_ktr.c +++ b/sys/kern/kern_ktr.c @@ -198,7 +198,7 @@ SYSCTL_PROC(_debug_ktr, OID_AUTO, mask, CTLTYPE_UINT|CTLFLAG_RW, 0, 0, sysctl_debug_ktr_mask, "IU", "Bitmask of KTR event classes for which logging is enabled"); -#if KTR_ENTRIES != KTR_BOOT_ENTRIES +#if KTR_ENTRIES > KTR_BOOT_ENTRIES /* * A simplified version of sysctl_debug_ktr_entries. * No need to care about SMP, scheduling, etc. @@ -213,6 +213,7 @@ ktr_entries_initializer(void *dummy __unused) ktr_mask = 0; ktr_buf = malloc(sizeof(*ktr_buf) * KTR_ENTRIES, M_KTR, M_WAITOK | M_ZERO); + memcpy(ktr_buf, ktr_buf_init, sizeof(ktr_buf_init)); ktr_entries = KTR_ENTRIES; ktr_mask = mask; } diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c index 1186e36..05fd5e5 100644 --- a/sys/kern/kern_malloc.c +++ b/sys/kern/kern_malloc.c @@ -186,16 +186,6 @@ struct { */ static uma_zone_t mt_zone; -static vm_offset_t vm_min_kernel_address = VM_MIN_KERNEL_ADDRESS; -SYSCTL_ULONG(_vm, OID_AUTO, min_kernel_address, CTLFLAG_RD, - &vm_min_kernel_address, 0, "Min kernel address"); - -#ifndef __sparc64__ -static vm_offset_t vm_max_kernel_address = VM_MAX_KERNEL_ADDRESS; -#endif -SYSCTL_ULONG(_vm, OID_AUTO, max_kernel_address, CTLFLAG_RD, - &vm_max_kernel_address, 0, "Max kernel address"); - u_long vm_kmem_size; SYSCTL_ULONG(_vm, OID_AUTO, kmem_size, CTLFLAG_RDTUN, &vm_kmem_size, 0, "Size of kernel memory"); @@ -592,7 +582,6 @@ free(void *addr, struct malloc_type *mtp) panic("free: address %p(%p) has not been allocated.\n", addr, (void *)((u_long)addr & (~UMA_SLAB_MASK))); - if (!(slab->us_flags & UMA_SLAB_MALLOC)) { #ifdef INVARIANTS struct malloc_type **mtpp = addr; |
