From b0e3391767201b0e39d1bca4efa02976c6382d56 Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Thu, 7 Jul 2022 15:51:20 +0100 Subject: [PATCH] Revert "ANDROID: KVM: arm64: pkvm: Update the shadow view of pkvm.enabled at creation time" This reverts commit 7c52b4e55a90cdb666848b724c1331296f322a0a. Bug: 233587962 Signed-off-by: Will Deacon Change-Id: I554fc97f1eb09ecea5ebee3cd97d99aef34f63ac --- arch/arm64/kvm/hyp/nvhe/pkvm.c | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm64/kvm/hyp/nvhe/pkvm.c b/arch/arm64/kvm/hyp/nvhe/pkvm.c index a3e53009696a..a7f14e2df6e5 100644 --- a/arch/arm64/kvm/hyp/nvhe/pkvm.c +++ b/arch/arm64/kvm/hyp/nvhe/pkvm.c @@ -358,7 +358,6 @@ static int init_shadow_structs(struct kvm *kvm, struct kvm_shadow_vm *vm, vm->host_kvm = kvm; vm->created_vcpus = 0; vm->arch.pkvm.pvmfw_load_addr = kvm->arch.pkvm.pvmfw_load_addr; - vm->arch.pkvm.enabled = READ_ONCE(kvm->arch.pkvm.enabled); for (i = 0; i < nr_vcpus; i++) { struct kvm_vcpu *host_vcpu = kern_hyp_va(vcpu_array[i]);