From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Mon, 19 Oct 2009 15:51:28 +0000 (+0100)
Subject: Revert "[ARM] unconditionally define __virt_to_phys and __phys_to_virt"
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=a8cf81ffe0284660fe405e7189f47f1b032f5261;p=deliverable%2Flinux.git

Revert "[ARM] unconditionally define __virt_to_phys and __phys_to_virt"

This reverts commit 75f4aa15cf05ce6d99c8261cf57dcd749877fd1c.

We have a couple of platforms which require non-linear P:V mappings,
so we need these to be overridable.

Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/arch/arm/include/asm/memory.h b/arch/arm/include/asm/memory.h
index cefedf062138..bc2ff8b28133 100644
--- a/arch/arm/include/asm/memory.h
+++ b/arch/arm/include/asm/memory.h
@@ -125,8 +125,10 @@
  * private definitions which should NOT be used outside memory.h
  * files.  Use virt_to_phys/phys_to_virt/__pa/__va instead.
  */
+#ifndef __virt_to_phys
 #define __virt_to_phys(x)	((x) - PAGE_OFFSET + PHYS_OFFSET)
 #define __phys_to_virt(x)	((x) - PHYS_OFFSET + PAGE_OFFSET)
+#endif
 
 /*
  * Convert a physical address to a Page Frame Number and back