diff options
| author | Dong Aisheng <aisheng.dong@nxp.com> | 2019-12-02 18:02:32 +0800 |
|---|---|---|
| committer | Dong Aisheng <aisheng.dong@nxp.com> | 2019-12-02 18:02:32 +0800 |
| commit | 89c08f49efd4bf0a1522dbee2ec168e3fdd745de (patch) | |
| tree | 82233b61f31f956129517fd7e0975f4d9cea51c4 /arch/arm/include | |
| parent | 0e41cf483e97ab37b79bcb06eb6582b31404d3b2 (diff) | |
| parent | 092146ab09920ae0076a96e45bf04b4d7be22c0c (diff) | |
Merge branch 'kvm/next' into next
* kvm/next:
virt/vgic: Increase number of DeviceIDs to 17
arm/arm64: KVM: drop qman mmio cacheable mapping hack
arm/arm64 KVM: allow specifying s2 prot bits when mapping i/o
arm64: KVM: support flushing device memory
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/kvm_mmu.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/include/asm/kvm_mmu.h b/arch/arm/include/asm/kvm_mmu.h index 0d84d50bf9ba..d18f3ef33633 100644 --- a/arch/arm/include/asm/kvm_mmu.h +++ b/arch/arm/include/asm/kvm_mmu.h @@ -55,7 +55,8 @@ void stage2_unmap_vm(struct kvm *kvm); int kvm_alloc_stage2_pgd(struct kvm *kvm); void kvm_free_stage2_pgd(struct kvm *kvm); int kvm_phys_addr_ioremap(struct kvm *kvm, phys_addr_t guest_ipa, - phys_addr_t pa, unsigned long size, bool writable); + phys_addr_t pa, unsigned long size, bool writable, + pgprot_t prot); int kvm_handle_guest_abort(struct kvm_vcpu *vcpu, struct kvm_run *run); |