X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;ds=sidebyside;f=arch%2Farm%2Finclude%2Fasm%2Fmemory.h;h=38f243796d5e82f4effb4d1efaa4193130343ae8;hb=5bd299abd8a96938727df4925317b65c83511171;hp=6748d6295a1a07ec23738d660dafb88489f99595;hpb=42e8187c104a8b01c4b5ad7cc0fa576a734b23bb;p=karo-tx-linux.git

diff --git a/arch/arm/include/asm/memory.h b/arch/arm/include/asm/memory.h
index 6748d6295a1a..38f243796d5e 100644
--- 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);
 }