diff options
author | Will Deacon <will@kernel.org> | 2022-06-09 13:12:22 +0100 |
---|---|---|
committer | Marc Zyngier <maz@kernel.org> | 2022-06-09 13:24:02 +0100 |
commit | 5879c97f37022ff22a3f13174c24fcf2807fdbc0 (patch) | |
tree | a19344d75408060d9e08907cbb58b9c31fe169de | |
parent | 112f3bab41113dc53b4f35e9034b2208245bc002 (diff) | |
download | linux-5879c97f37022ff22a3f13174c24fcf2807fdbc0.tar.bz2 |
KVM: arm64: Remove redundant hyp_assert_lock_held() assertions
host_stage2_try() asserts that the KVM host lock is held, so there's no
need to duplicate the assertion in its wrappers.
Signed-off-by: Will Deacon <will@kernel.org>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20220609121223.2551-6-will@kernel.org
-rw-r--r-- | arch/arm64/kvm/hyp/nvhe/mem_protect.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm64/kvm/hyp/nvhe/mem_protect.c b/arch/arm64/kvm/hyp/nvhe/mem_protect.c index 78edf077fa3b..1e78acf9662e 100644 --- a/arch/arm64/kvm/hyp/nvhe/mem_protect.c +++ b/arch/arm64/kvm/hyp/nvhe/mem_protect.c @@ -314,15 +314,11 @@ static int host_stage2_adjust_range(u64 addr, struct kvm_mem_range *range) int host_stage2_idmap_locked(phys_addr_t addr, u64 size, enum kvm_pgtable_prot prot) { - hyp_assert_lock_held(&host_kvm.lock); - return host_stage2_try(__host_stage2_idmap, addr, addr + size, prot); } int host_stage2_set_owner_locked(phys_addr_t addr, u64 size, u8 owner_id) { - hyp_assert_lock_held(&host_kvm.lock); - return host_stage2_try(kvm_pgtable_stage2_set_owner, &host_kvm.pgt, addr, size, &host_s2_pool, owner_id); } |