SVN - r334189 breaks build

[K. Macy]

Fix going in in about 10

On Thu, May 24, 2018 at 3:45 PM, Michael Butler
<imb at protected-networks.net> wrote:
> On a GENERIC box ..
>
> --- bridgestp.o ---
> /usr/src/sys/net/bridgestp.c:2046:2: error: no member named 'cstqe_next'
> in 'struct ifnet::(anonymous at /usr/src/sys/net/if_var.h:241:2)'; did
> you mean 'stqe_next'?
>         CK_STAILQ_FOREACH(ifp, &V_ifnet, if_link) {
>         ^
> /usr/src/sys/contrib/ck/include/ck_queue.h:253:13: note: expanded from
> macro 'CK_STAILQ_FOREACH'
>            (var) = CK_STAILQ_NEXT((var), field))
>                    ^
> /usr/src/sys/contrib/ck/include/ck_queue.h:291:32: note: expanded from
> macro 'CK_STAILQ_NEXT'
>         (ck_pr_load_ptr(&(elm)->field.cstqe_next))
>                                       ^
> /usr/src/sys/net/if_var.h:241:2: note: 'stqe_next' declared here
>         STAILQ_ENTRY(ifnet) if_link;    /* all struct ifnets are chained
> (CK_) */
>
> And on a custom kernel ..
>
> --- hwpmc_mod.o ---
> /usr/src/sys/dev/hwpmc/hwpmc_mod.c:1727:2: error: no member named
> 'clh_first' in 'struct (anonymous at
> /usr/src/sys/dev/hwpmc/hwpmc_mod.c:178:8)'; did you mean 'lh_first'?
>         CK_LIST_FOREACH(po, &pmc_ss_owners, po_ssnext)
>         ^
> /usr/src/sys/contrib/ck/include/ck_queue.h:363:15: note: expanded from
> macro 'CK_LIST_FOREACH'
>         for ((var) = CK_LIST_FIRST((head));
>        \
>                      ^
> /usr/src/sys/contrib/ck/include/ck_queue.h:358:54: note: expanded from
> macro 'CK_LIST_FIRST'
> #define CK_LIST_FIRST(head)             ck_pr_load_ptr(&(head)->clh_first)
>                                                                 ^
> /usr/src/sys/dev/hwpmc/hwpmc_mod.c:178:8: note: 'lh_first' declared here
> static LIST_HEAD(, pmc_owner)                   pmc_ss_owners;
>        ^
> _______________________________________________
> 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"