summaryrefslogtreecommitdiffstats
path: root/arch/arm64/include
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2014-01-15 12:14:29 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2014-01-15 12:14:29 +0100
commitab53f22e2e2dbb60d4eb1b505776f03da4aa9bdc (patch)
tree6ebddac80d6f05c4ac58186227c062e94f55ada2 /arch/arm64/include
parent4a55dd7273c95b4a19fbcf0ae1bbd1cfd09dfc36 (diff)
parent61466710de078c697106fa5b70ec7afc9feab520 (diff)
downloadop-kernel-dev-ab53f22e2e2dbb60d4eb1b505776f03da4aa9bdc.zip
op-kernel-dev-ab53f22e2e2dbb60d4eb1b505776f03da4aa9bdc.tar.gz
Merge tag 'kvm-arm-for-3.14' of git://git.linaro.org/people/christoffer.dall/linux-kvm-arm into kvm-queue
Diffstat (limited to 'arch/arm64/include')
-rw-r--r--arch/arm64/include/asm/kvm_mmu.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/include/asm/kvm_mmu.h b/arch/arm64/include/asm/kvm_mmu.h
index 680f74e..7f1f940 100644
--- a/arch/arm64/include/asm/kvm_mmu.h
+++ b/arch/arm64/include/asm/kvm_mmu.h
@@ -136,6 +136,7 @@ static inline void coherent_icache_guest_page(struct kvm *kvm, hva_t hva,
}
#define kvm_flush_dcache_to_poc(a,l) __flush_dcache_area((a), (l))
+#define kvm_virt_to_phys(x) __virt_to_phys((unsigned long)(x))
#endif /* __ASSEMBLY__ */
#endif /* __ARM64_KVM_MMU_H__ */
OpenPOWER on IntegriCloud