diff options
| author | Marc Zyngier <maz@kernel.org> | 2020-09-11 17:54:30 +0300 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2020-09-11 17:54:30 +0300 |
| commit | ae8bd85ca8a4a812721388ab85b3d67077951f52 (patch) | |
| tree | b01af045e7352464aa5ede530dc772dc52e5907e /arch/arm64/include/asm/kvm_host.h | |
| parent | 7b75cd5128421c673153efb1236705696a1a9812 (diff) | |
| parent | c9b69a0cf0b4336fe7d2e35c46273debc68910fd (diff) | |
| download | linux-ae8bd85ca8a4a812721388ab85b3d67077951f52.tar.xz | |
Merge branch 'kvm-arm64/pt-new' into kvmarm-master/next
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'arch/arm64/include/asm/kvm_host.h')
| -rw-r--r-- | arch/arm64/include/asm/kvm_host.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h index af4989a25bb7..317bafde1442 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -79,8 +79,8 @@ struct kvm_s2_mmu { * for vEL1/EL0 with vHCR_EL2.VM == 0. In that case, we use the * canonical stage-2 page tables. */ - pgd_t *pgd; phys_addr_t pgd_phys; + struct kvm_pgtable *pgt; /* The last vcpu id that ran on each physical CPU */ int __percpu *last_vcpu_ran; @@ -472,7 +472,7 @@ int __kvm_arm_vcpu_set_events(struct kvm_vcpu *vcpu, #define KVM_ARCH_WANT_MMU_NOTIFIER int kvm_unmap_hva_range(struct kvm *kvm, - unsigned long start, unsigned long end); + unsigned long start, unsigned long end, unsigned flags); int kvm_set_spte_hva(struct kvm *kvm, unsigned long hva, pte_t pte); int kvm_age_hva(struct kvm *kvm, unsigned long start, unsigned long end); int kvm_test_age_hva(struct kvm *kvm, unsigned long hva); |