From c93313e2b697e258560d563c58969c3f3c2e9cb9 Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Thu, 7 Jul 2022 15:49:12 +0100 Subject: [PATCH] Revert "ANDROID: KVM: arm64: Only call kvm_shadow_destroy() in protected mode" This reverts commit 0863f25b5d860658655100b8e83d6cdbd87d315b. Bug: 233587962 Signed-off-by: Will Deacon Change-Id: I62a13366e694441b688d6555fe8a19cb6552c031 --- arch/arm64/kvm/arm.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c index e776c75251de..ecff76d00f10 100644 --- a/arch/arm64/kvm/arm.c +++ b/arch/arm64/kvm/arm.c @@ -231,9 +231,7 @@ void kvm_arch_destroy_vm(struct kvm *kvm) bitmap_free(kvm->arch.pmu_filter); kvm_vgic_destroy(kvm); - - if (is_protected_kvm_enabled()) - kvm_shadow_destroy(kvm); + kvm_shadow_destroy(kvm); for (i = 0; i < KVM_MAX_VCPUS; ++i) { if (kvm->vcpus[i]) {