diff options
| author | Oliver Upton <oliver.upton@linux.dev> | 2024-11-11 19:47:50 +0100 |
|---|---|---|
| committer | Oliver Upton <oliver.upton@linux.dev> | 2024-11-11 19:47:50 +0100 |
| commit | fbf3372baa9daabec9b899fc96ba50aa0c78fd39 (patch) | |
| tree | 354f8dc3371e823a033cbb55965637485bd806cc /arch/arm64/kvm/hyp/include/nvhe/trap_handler.h | |
| parent | Merge branch kvm-arm64/mpam-ni into kvmarm/next (diff) | |
| parent | KVM: selftests: Don't bother deleting memslots in KVM when freeing VMs (diff) | |
| download | linux-fbf3372baa9daabec9b899fc96ba50aa0c78fd39.tar.xz linux-fbf3372baa9daabec9b899fc96ba50aa0c78fd39.zip | |
Merge branch kvm-arm64/misc into kvmarm/next
* kvm-arm64/misc:
: Miscellaneous updates
:
: - Drop useless check against vgic state in ICC_CLTR_EL1.SEIS read
: emulation
:
: - Fix trap configuration for pKVM
:
: - Close the door on initialization bugs surrounding userspace irqchip
: static key by removing it.
KVM: selftests: Don't bother deleting memslots in KVM when freeing VMs
KVM: arm64: Get rid of userspace_irqchip_in_use
KVM: arm64: Initialize trap register values in hyp in pKVM
KVM: arm64: Initialize the hypervisor's VM state at EL2
KVM: arm64: Refactor kvm_vcpu_enable_ptrauth() for hyp use
KVM: arm64: Move pkvm_vcpu_init_traps() to init_pkvm_hyp_vcpu()
KVM: arm64: Don't map 'kvm_vgic_global_state' at EL2 with pKVM
KVM: arm64: Just advertise SEIS as 0 when emulating ICC_CTLR_EL1
Signed-off-by: Oliver Upton <oliver.upton@linux.dev>
Diffstat (limited to 'arch/arm64/kvm/hyp/include/nvhe/trap_handler.h')
| -rw-r--r-- | arch/arm64/kvm/hyp/include/nvhe/trap_handler.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm64/kvm/hyp/include/nvhe/trap_handler.h b/arch/arm64/kvm/hyp/include/nvhe/trap_handler.h index 45a84f0ade04..1e6d995968a1 100644 --- a/arch/arm64/kvm/hyp/include/nvhe/trap_handler.h +++ b/arch/arm64/kvm/hyp/include/nvhe/trap_handler.h @@ -15,6 +15,4 @@ #define DECLARE_REG(type, name, ctxt, reg) \ type name = (type)cpu_reg(ctxt, (reg)) -void __pkvm_vcpu_init_traps(struct kvm_vcpu *vcpu); - #endif /* __ARM64_KVM_NVHE_TRAP_HANDLER_H__ */ |