d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compile issues when building a kernel without the VIMAGE option.

Browse Source 
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
This commit is contained in:
tuexen 2019-10-19 20:48:53 +00:00
parent 3073a2ee26
commit 71224580cf
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/net/debugnet.c
View File

@ -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>

11
sys/netinet/netdump/netdump_client.c
View File

@ -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