svn commit: r246301 - head/sys/kern
Marius Strobl
marius at FreeBSD.org
Sun Feb 3 21:43:56 UTC 2013
Author: marius
Date: Sun Feb 3 21:43:55 2013
New Revision: 246301
URL: http://svnweb.freebsd.org/changeset/base/246301
Log:
Further improve r242655 and supply VM_{MIN,MAX}_KERNEL_ADDRESS as constant
values to SYSCTL_ULONG(9) where possible.
Submitted by: bde
Modified:
head/sys/kern/kern_malloc.c
Modified: head/sys/kern/kern_malloc.c
==============================================================================
--- head/sys/kern/kern_malloc.c Sun Feb 3 21:30:29 2013 (r246300)
+++ head/sys/kern/kern_malloc.c Sun Feb 3 21:43:55 2013 (r246301)
@@ -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;
More information about the svn-src-all
mailing list