Author: tuexen Date: Sat Oct 19 20:48:53 2019 New Revision: 353770 URL: https://svnweb.freebsd.org/changeset/base/353770
Log: Fix compile issues when building a kernel without the VIMAGE option. Thanks to cem@ for discussing the issue which resulted in this patch. Reviewed by: cem@ Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D22089 Modified: head/sys/net/debugnet.c head/sys/netinet/netdump/netdump_client.c Modified: head/sys/net/debugnet.c ============================================================================== --- head/sys/net/debugnet.c Sat Oct 19 19:52:19 2019 (r353769) +++ head/sys/net/debugnet.c Sat Oct 19 20:48:53 2019 (r353770) @@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$"); #include <sys/systm.h> #include <sys/endian.h> #include <sys/errno.h> +#include <sys/eventhandler.h> #include <sys/socket.h> #include <sys/sysctl.h> Modified: head/sys/netinet/netdump/netdump_client.c ============================================================================== --- head/sys/netinet/netdump/netdump_client.c Sat Oct 19 19:52:19 2019 (r353769) +++ head/sys/netinet/netdump/netdump_client.c Sat Oct 19 20:48:53 2019 (r353770) @@ -409,20 +409,13 @@ static int netdump_configure(struct diocskerneldump_arg *conf, struct thread *td) { struct ifnet *ifp; - struct vnet *vnet; NETDUMP_ASSERT_WLOCKED(); if (conf->kda_iface[0] != 0) { - if (td != NULL) - vnet = TD_TO_VNET(td); - else - vnet = vnet0; - CURVNET_SET(vnet); - if (td != NULL && !IS_DEFAULT_VNET(curvnet)) { - CURVNET_RESTORE(); + if (td != NULL && !IS_DEFAULT_VNET(TD_TO_VNET(td))) return (EINVAL); - } + CURVNET_SET(vnet0); ifp = ifunit_ref(conf->kda_iface); CURVNET_RESTORE(); } else _______________________________________________ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
