From dc9a1fcadb5e73e676a7aff4cdee9a2edfd2ec2d Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Thu, 7 Jul 2022 15:52:08 +0100 Subject: [PATCH] Revert "FROMLIST: KVM: arm64: Check if running in VHE from kvm_host_owns_hyp_mappings()" This reverts commit 0ebed5c7abb2654c51373bb3719a39d41c11315a. Bug: 233587962 Signed-off-by: Will Deacon Change-Id: I1f8355defaded5113c673aa8e0e83b9664d4ef18 --- arch/arm64/kvm/mmu.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c index f8f1096a297f..326cdfec74a1 100644 --- a/arch/arm64/kvm/mmu.c +++ b/arch/arm64/kvm/mmu.c @@ -239,9 +239,6 @@ void free_hyp_pgds(void) static bool kvm_host_owns_hyp_mappings(void) { - if (is_kernel_in_hyp_mode()) - return false; - if (static_branch_likely(&kvm_protected_mode_initialized)) return false;