diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2016-05-11 20:37:37 (GMT) |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2016-05-11 20:37:37 (GMT) |
| commit | bdb4094eb57aeab6683ea9c90d8b29271bf34405 (patch) | |
| tree | b9776acb6d5897745ce33c08bfa974598c658b23 /arch/arm/kvm/arm.c | |
| parent | 6ac0f61f47a24bad3fa99ee6a46c0cc5a245ee91 (diff) | |
| parent | 06485053244480f5f403d8f89b8617bd7d549113 (diff) | |
| download | linux-bdb4094eb57aeab6683ea9c90d8b29271bf34405.tar.xz | |
Merge tag 'kvm-arm-for-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD
KVM/ARM Changes for Linux v4.7
Reworks our stage 2 page table handling to have page table manipulation
macros separate from those of the host systems as the underlying
hardware page tables can be configured to be noticably different in
layout from the stage 1 page tables used by the host.
Adds 16K page size support based on the above.
Adds a generic firmware probing layer for the timer and GIC so that KVM
initializes using the same logic based on both ACPI and FDT.
Finally adds support for hardware updating of the access flag.
Diffstat (limited to 'arch/arm/kvm/arm.c')
| -rw-r--r-- | arch/arm/kvm/arm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c index dded1b7..be4b639 100644 --- a/arch/arm/kvm/arm.c +++ b/arch/arm/kvm/arm.c @@ -448,7 +448,7 @@ static void update_vttbr(struct kvm *kvm) kvm_next_vmid &= (1 << kvm_vmid_bits) - 1; /* update vttbr to be used with the new vmid */ - pgd_phys = virt_to_phys(kvm_get_hwpgd(kvm)); + pgd_phys = virt_to_phys(kvm->arch.pgd); BUG_ON(pgd_phys & ~VTTBR_BADDR_MASK); vmid = ((u64)(kvm->arch.vmid) << VTTBR_VMID_SHIFT) & VTTBR_VMID_MASK(kvm_vmid_bits); kvm->arch.vttbr = pgd_phys | vmid; |