3 files changed, 6 insertions, 4 deletions

diff --git a/arch/arm/include/asm/kvm_mmu.h b/arch/arm/include/asm/kvm_mmu.h
index 77de4a41cc50..2d122adcdb22 100644
--- a/arch/arm/include/asm/kvm_mmu.h
+++ b/arch/arm/include/asm/kvm_mmu.h
@@ -140,6 +140,7 @@ static inline void coherent_icache_guest_page(struct kvm *kvm, hva_t hva,
 }
 
 #define kvm_flush_dcache_to_poc(a,l)    __cpuc_flush_dcache_area((a), (l))
+#define kvm_virt_to_phys(x)             virt_to_idmap((unsigned long)(x))
 
 #endif  /* !__ASSEMBLY__ */
 
diff --git a/arch/arm/kvm/mmu.c b/arch/arm/kvm/mmu.c
index 580906989db1..659db0ed1370 100644
--- a/arch/arm/kvm/mmu.c
+++ b/arch/arm/kvm/mmu.c
@@ -916,9 +916,9 @@ int kvm_mmu_init(void)
 {
         int err;
 
-        hyp_idmap_start = virt_to_phys(__hyp_idmap_text_start);
-        hyp_idmap_end = virt_to_phys(__hyp_idmap_text_end);
-        hyp_idmap_vector = virt_to_phys(__kvm_hyp_init);
+        hyp_idmap_start = kvm_virt_to_phys(__hyp_idmap_text_start);
+        hyp_idmap_end = kvm_virt_to_phys(__hyp_idmap_text_end);
+        hyp_idmap_vector = kvm_virt_to_phys(__kvm_hyp_init);
 
         if ((hyp_idmap_start ^ hyp_idmap_end) & PAGE_MASK) {
                 /*
@@ -945,7 +945,7 @@ int kvm_mmu_init(void)
                  */
                 kvm_flush_dcache_to_poc(init_bounce_page, len);
 
-                phys_base = virt_to_phys(init_bounce_page);
+                phys_base = kvm_virt_to_phys(init_bounce_page);
                 hyp_idmap_vector += phys_base - hyp_idmap_start;
                 hyp_idmap_start = phys_base;
                 hyp_idmap_end = phys_base + len;
diff --git a/arch/arm64/include/asm/kvm_mmu.h b/arch/arm64/include/asm/kvm_mmu.h
index 680f74e67497..7f1f9408ff66 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__ */