diff options
| author | Mike Zeller <mike@mikezeller.net> | 2021-06-01 12:50:48 -0400 |
|---|---|---|
| committer | Mike Zeller <mike@mikezeller.net> | 2021-06-01 12:52:00 -0400 |
| commit | 1c9dda01d3f89e5ad6fd53c614f28e837e2f4592 (patch) | |
| tree | 22a9aa3bc13e219b8290ac8df0add64ff7dcfad9 /usr/src/uts/i86pc/io/vmm/intel/ept.c | |
| parent | dbc77341934ab60115dd8c98e9689fe531fac379 (diff) | |
| parent | 10c0779de9b4d8c4ebdb274e17730c49bc925f00 (diff) | |
| download | illumos-joyent-1c9dda01d3f89e5ad6fd53c614f28e837e2f4592.tar.gz | |
[illumos-gate merge]
commit 10c0779de9b4d8c4ebdb274e17730c49bc925f00
13740 net-routing-setup should support default gateway via link-local routes
commit 05c0ef072824e9e875c8b4ba7db90d3d270fccf7
13815 Trusted extensions /etc/security/tsol/label_encodings file installed with wrong permissions during gate build
commit 1a414bb636b35c18399549b05b65aef849e6f9df
13828 beadm: Fix wrong array size
commit cf409e3f26ef8db450f46ba9760eb9734f603ae0
13825 consolidate vm-related headers for bhyve
commit 3a9318192067bc7735a0a8b261c598c7d4129177
13318 Tidy up libdtrace_jni javadoc
commit 3984682357d7bf0332a2f7d5406e349229f168e2
13831 lofi: lofi_close() can not tear down lofi instance
commit 5cf013a3c9d3f3ca3a892f013ac067904135da06
13090 junk characters in `zpool online -e` EACCES error message
commit 517877177d6b869e3aecde6716479541650da10d
13836 several packages are missing license actions
Conflicts:
usr/src/Makefile
usr/src/man/man1m/route.1m
usr/src/cmd/svc/milestone/net-routing-setup
usr/src/uts/i86pc/io/vmm/vm/vm_map.h
Diffstat (limited to 'usr/src/uts/i86pc/io/vmm/intel/ept.c')
| -rw-r--r-- | usr/src/uts/i86pc/io/vmm/intel/ept.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/usr/src/uts/i86pc/io/vmm/intel/ept.c b/usr/src/uts/i86pc/io/vmm/intel/ept.c index 35e29bcfcc..49b01ebd36 100644 --- a/usr/src/uts/i86pc/io/vmm/intel/ept.c +++ b/usr/src/uts/i86pc/io/vmm/intel/ept.c @@ -51,11 +51,9 @@ __FBSDID("$FreeBSD$"); #include <sys/sysctl.h> #include <sys/hma.h> -#include <vm/vm.h> -#include <vm/pmap.h> -#include <vm/vm_extern.h> - +#include <machine/specialreg.h> #include <machine/vmm.h> +#include <sys/vmm_vm.h> #include "ept.h" |