From 4a8d2c41f1ac3f0e4acd9abfaff3fb23cce9bf0e Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Thu, 7 Jul 2022 15:51:18 +0100 Subject: [PATCH] Revert "ANDROID: KVM: arm64: pkvm: Don't init pvm traps non non-protected guests" This reverts commit 1fef38359c8699e7d6ca630133e5e6ec0b823ed4. Bug: 233587962 Signed-off-by: Will Deacon Change-Id: Ib43801b7ccbae0ff3dbba90fd5807545a185c238 --- arch/arm64/kvm/hyp/nvhe/pkvm.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm64/kvm/hyp/nvhe/pkvm.c b/arch/arm64/kvm/hyp/nvhe/pkvm.c index d80e0d8f255e..a3e53009696a 100644 --- a/arch/arm64/kvm/hyp/nvhe/pkvm.c +++ b/arch/arm64/kvm/hyp/nvhe/pkvm.c @@ -379,8 +379,7 @@ static int init_shadow_structs(struct kvm *kvm, struct kvm_shadow_vm *vm, if (ret) return ret; - if (vm->arch.pkvm.enabled) - pkvm_vcpu_init_traps(shadow_vcpu); + pkvm_vcpu_init_traps(shadow_vcpu); kvm_reset_pvm_sys_regs(shadow_vcpu); vm->vcpus[i] = shadow_vcpu;