From e8cbe54bc470be4daa9e644cc1f2a0f4bf1424c3 Mon Sep 17 00:00:00 2001
From: Marius Strobl <marius@FreeBSD.org>
Date: Sun, 3 Feb 2013 21:43:55 +0000
Subject: [PATCH] Further improve r242655 and supply
 VM_{MIN,MAX}_KERNEL_ADDRESS as constant values to SYSCTL_ULONG(9) where
 possible.

Submitted by:	bde
---
 sys/kern/kern_malloc.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c
index 1186e3664a8b..234af38f346a 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");
 
-#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");
+#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,
@@ -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;