SecBSD/src
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync with OpenBSD -current

Browse source
This commit is contained in:
purplerain 2024-10-06 20:38:55 +00:00
parent 8d26df7b18
commit ddc9562b79
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
16 changed files with 65 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

6
sys/arch/amd64/amd64/cpu.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: cpu.c,v 1.193 2024/09/26 13:18:25 dv Exp $ */
/* $OpenBSD: cpu.c,v 1.194 2024/10/06 16:24:02 semarie Exp $ */
/* $NetBSD: cpu.c,v 1.1 2003/04/26 18:39:26 fvdl Exp $ */
/*-
@ -904,8 +904,8 @@ cpu_init_vmm(struct cpu_info *ci)
ci->ci_vmcs_pa = VMX_VMCS_PA_CLEAR;
rw_init(&ci->ci_vmcs_lock, "vmcslock");
msr = rdmsr(IA32_VMX_EPT_VPID_CAP);
if (msr & IA32_EPT_VPID_CAP_INVEPT_CONTEXT)
if (rdmsr_safe(IA32_VMX_EPT_VPID_CAP, &msr) == 0 &&
msr & IA32_EPT_VPID_CAP_INVEPT_CONTEXT)
ci->ci_vmm_cap.vcc_vmx.vmx_invept_mode =
IA32_VMX_INVEPT_SINGLE_CTX;
else

9
sys/arch/amd64/amd64/genassym.cf
View file

@ -1,21 +1,16 @@
# $OpenBSD: genassym.cf,v 1.45 2024/02/12 01:18:17 guenther Exp $
# $OpenBSD: genassym.cf,v 1.46 2024/10/05 09:54:39 jsg Exp $
# Written by Artur Grabowski art@openbsd.org, Public Domain
include <sys/param.h>
include <sys/proc.h>
include <sys/mutex.h>
include <sys/resourcevar.h>
include <sys/device.h>
include <sys/user.h>
include <uvm/uvm_extern.h>
include <machine/trap.h>
include <machine/pcb.h>
include <machine/pmap.h>
include <machine/pte.h>
include <machine/vmparam.h>
include <machine/intr.h>
include <machine/pic.h>
include <machine/tss.h>
include <machine/i82093var.h>