diff options
author | marius <marius@FreeBSD.org> | 2013-02-03 21:43:55 +0000 |
---|---|---|
committer | marius <marius@FreeBSD.org> | 2013-02-03 21:43:55 +0000 |
commit | a41f9579b9492ffe02266020c79c6ec9b54abdc3 (patch) | |
tree | d5208e3615b35d096dd81367b5bfa2c0094ab6c7 /sys/kern/kern_malloc.c | |
parent | 5ca194224ab7a8a3c9c612783ccacc61e55a58e6 (diff) | |
download | FreeBSD-src-a41f9579b9492ffe02266020c79c6ec9b54abdc3.zip FreeBSD-src-a41f9579b9492ffe02266020c79c6ec9b54abdc3.tar.gz |
Further improve r242655 and supply VM_{MIN,MAX}_KERNEL_ADDRESS as constant
values to SYSCTL_ULONG(9) where possible.
Submitted by: bde
Diffstat (limited to 'sys/kern/kern_malloc.c')
-rw-r--r-- | sys/kern/kern_malloc.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c index 1186e36..234af38 100644 --- a/sys/kern/kern_malloc.c +++ b/sys/kern/kern_malloc.c @@ -186,15 +186,16 @@ 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"); +SYSCTL_ULONG(_vm, OID_AUTO, min_kernel_address, CTLFLAG_RD, NULL, + VM_MIN_KERNEL_ADDRESS, "Min kernel address"); +SYSCTL_ULONG(_vm, OID_AUTO, max_kernel_address, CTLFLAG_RD, #ifndef __sparc64__ -static vm_offset_t vm_max_kernel_address = VM_MAX_KERNEL_ADDRESS; + NULL, VM_MAX_KERNEL_ADDRESS, +#else + &vm_max_kernel_address, 0, #endif -SYSCTL_ULONG(_vm, OID_AUTO, max_kernel_address, CTLFLAG_RD, - &vm_max_kernel_address, 0, "Max kernel address"); + "Max kernel address"); u_long vm_kmem_size; SYSCTL_ULONG(_vm, OID_AUTO, kmem_size, CTLFLAG_RDTUN, &vm_kmem_size, 0, @@ -592,7 +593,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; |