OSDN Git Service

Merge branch kvm-arm64/mmu/vmid-cleanups into kvmarm-master/next
authorMarc Zyngier <maz@kernel.org>
Fri, 20 Aug 2021 11:23:15 +0000 (12:23 +0100)
committerMarc Zyngier <maz@kernel.org>
Fri, 20 Aug 2021 11:23:15 +0000 (12:23 +0100)
commitdeb151a58210d8dfb1a7cc1f14fec35b520c38a6
tree7cb32e5af5d49ec5e90022c88e0497627f8b614f
parentca3385a507ad918fb8b7a6a52ad3d321601a66f2
parentcf364e08ea1c5dd217afb658d510aaef7d0cc6f4
Merge branch kvm-arm64/mmu/vmid-cleanups into kvmarm-master/next

* kvm-arm64/mmu/vmid-cleanups:
  : Cleanup the stage-2 configuration by providing a single helper,
  : and tidy up some of the ordering requirements for the VMID
  : allocator.
  KVM: arm64: Upgrade VMID accesses to {READ,WRITE}_ONCE
  KVM: arm64: Unify stage-2 programming behind __load_stage2()
  KVM: arm64: Move kern_hyp_va() usage in __load_guest_stage2() into the callers

Signed-off-by: Marc Zyngier <maz@kernel.org>
arch/arm64/kvm/arm.c
arch/arm64/kvm/hyp/include/nvhe/mem_protect.h
arch/arm64/kvm/hyp/nvhe/mem_protect.c
arch/arm64/kvm/mmu.c