ARM: Use arch_virt_to_idmap() only when available

The arch_virt_to_idmap variable is only available when patching of the
physical to virtual translations at runtime is enabled via the Kconfig
ARM_PATCH_PHYS_VIRT option.

Signed-off-by: Thierry Reding <treding@nvidia.com>

diff --git a/arch/arm/include/asm/memory.h b/arch/arm/include/asm/memory.h
index 6748d6295a1a07ec23738d660dafb88489f99595..38f243796d5e82f4effb4d1efaa4193130343ae8 100644 (file)
--- a/arch/arm/include/asm/memory.h
+++ b/arch/arm/include/asm/memory.h
@@ -297,9 +297,11 @@ static inline void *phys_to_virt(phys_addr_t x)
  */
 static inline phys_addr_t __virt_to_idmap(unsigned long x)
 {
+#ifdef CONFIG_ARM_PATCH_VIRT_PHYS
        if (arch_virt_to_idmap)
                return arch_virt_to_idmap(x);
        else
+#endif
                return __virt_to_phys(x);
 }