svn commit: r355166 - head/sys/vm

[Jeff Roberson]

Thank you.  mea culpa.

Jeff

On Thu, 28 Nov 2019, Ryan Libby wrote:

> Author: rlibby
> Date: Thu Nov 28 04:15:16 2019
> New Revision: 355166
> URL: https://svnweb.freebsd.org/changeset/base/355166
>
> Log:
>  uma: move sysctl vm.uma defn out from under INVARIANTS
>
>  Fix non-INVARIANTS builds after r355149.
>
>  Reported by:	Michael Butler <imb at protected-networks.net>
>  Reviewed by:	markj
>  Differential Revision:	https://reviews.freebsd.org/D22588
>
> Modified:
>  head/sys/vm/uma_core.c
>
> Modified: head/sys/vm/uma_core.c
> ==============================================================================
> --- head/sys/vm/uma_core.c	Thu Nov 28 02:40:12 2019	(r355165)
> +++ head/sys/vm/uma_core.c	Thu Nov 28 04:15:16 2019	(r355166)
> @@ -297,7 +297,6 @@ static bool uma_dbg_zskip(uma_zone_t zone, void *mem);
> static void uma_dbg_free(uma_zone_t zone, uma_slab_t slab, void *item);
> static void uma_dbg_alloc(uma_zone_t zone, uma_slab_t slab, void *item);
>
> -SYSCTL_NODE(_vm, OID_AUTO, uma, CTLFLAG_RW, 0, "Universal Memory Allocator");
> static SYSCTL_NODE(_vm, OID_AUTO, debug, CTLFLAG_RD, 0,
>     "Memory allocation debugging");
>
> @@ -315,6 +314,8 @@ SYSCTL_COUNTER_U64(_vm_debug, OID_AUTO, skipped, CTLFL
> #endif
>
> SYSINIT(uma_startup3, SI_SUB_VM_CONF, SI_ORDER_SECOND, uma_startup3, NULL);
> +
> +SYSCTL_NODE(_vm, OID_AUTO, uma, CTLFLAG_RW, 0, "Universal Memory Allocator");
>
> SYSCTL_PROC(_vm, OID_AUTO, zone_count, CTLFLAG_RD|CTLTYPE_INT,
>     0, 0, sysctl_vm_zone_count, "I", "Number of UMA zones");
>