From 94bfd5b1a047bc710081316292358642fb76111b Mon Sep 17 00:00:00 2001 From: Marius Strobl Date: Mon, 4 Feb 2013 09:35:48 +0000 Subject: [PATCH] Try to improve r242655 take III: move these SYSCTLs describing the kernel map, which is defined and initialized in vm/vm_kern.c, to the latter. Submitted by: alc --- sys/kern/kern_malloc.c | 11 ----------- sys/vm/vm_kern.c | 11 +++++++++++ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c index 234af38f346a..05fd5e560304 100644 --- a/sys/kern/kern_malloc.c +++ b/sys/kern/kern_malloc.c @@ -186,17 +186,6 @@ struct { */ static uma_zone_t mt_zone; -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__ - NULL, VM_MAX_KERNEL_ADDRESS, -#else - &vm_max_kernel_address, 0, -#endif - "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"); diff --git a/sys/vm/vm_kern.c b/sys/vm/vm_kern.c index f7318959303a..4d789cec2087 100644 --- a/sys/vm/vm_kern.c +++ b/sys/vm/vm_kern.c @@ -94,6 +94,17 @@ vm_map_t buffer_map=0; const void *zero_region; CTASSERT((ZERO_REGION_SIZE & PAGE_MASK) == 0); +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, +#ifdef __sparc64__ + &vm_max_kernel_address, 0, +#else + NULL, VM_MAX_KERNEL_ADDRESS, +#endif + "Max kernel address"); + /* * kmem_alloc_nofault: *