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
lupinglade · Oct 19, 2019 · 7122458 · 7122458
1 parent 3073a2e
commit 7122458
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/sys/net/debugnet.c b/sys/net/debugnet.c
@@ -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>
 

diff --git a/sys/netinet/netdump/netdump_client.c b/sys/netinet/netdump/netdump_client.c
@@ -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