SVN r355148/9 breaks build

[Ryan Libby]

On Wed, Nov 27, 2019 at 6:44 PM Michael Butler
<imb at protected-networks.net> wrote:
>
> Something missing from a header here?
>
> Building /usr/obj/usr/src/amd64.amd64/sys/VM01/uma_core.o
> --- uma_core.o ---
> /usr/src/sys/vm/uma_core.c:1864:39: error: use of undeclared identifier
> 'sysctl___vm_uma'
>         zone->uz_oid = SYSCTL_ADD_NODE(NULL,
> SYSCTL_STATIC_CHILDREN(_vm_uma),
>                                              ^
> /usr/src/sys/sys/sysctl.h:245:44: note: expanded from macro
> 'SYSCTL_STATIC_CHILDREN'
> #define SYSCTL_STATIC_CHILDREN(oid_name)
> (&sysctl__##oid_name.oid_children)
>                                                   ^
> <scratch space>:154:1: note: expanded from here
> sysctl___vm_uma
> ^
> /usr/src/sys/vm/uma_core.c:1864:15: error: assigning to 'struct
> sysctl_oid *' from incompatible type 'void'
>         zone->uz_oid = SYSCTL_ADD_NODE(NULL,
> SYSCTL_STATIC_CHILDREN(_vm_uma),
>                      ^
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> 2 errors generated.
> *** [uma_core.o] Error code 1
>
>         imb
> _______________________________________________
> freebsd-current at freebsd.org mailing list
> https://lists.freebsd.org/mailman/listinfo/freebsd-current
> To unsubscribe, send any mail to "freebsd-current-unsubscribe at freebsd.org"

Ah, SYSCTL_NODE(_vm, OID_AUTO, uma, ...) is accidentally under
INVARIANTS and needs to move out.

I'll patch this up in an hour if jeff or someone else doesn't beat me to it.