summaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm/memory.h
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2009-10-19 16:51:28 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-10-19 16:51:28 +0100
commita8cf81ffe0284660fe405e7189f47f1b032f5261 (patch)
tree9fad43f8d6e29fe4cc00f0d9749f2c70617068ed /arch/arm/include/asm/memory.h
parent2fdc246aaf9a7fa088451ad2a72e9119b5f7f029 (diff)
downloadop-kernel-dev-a8cf81ffe0284660fe405e7189f47f1b032f5261.zip
op-kernel-dev-a8cf81ffe0284660fe405e7189f47f1b032f5261.tar.gz
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>
Diffstat (limited to 'arch/arm/include/asm/memory.h')
-rw-r--r--arch/arm/include/asm/memory.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/include/asm/memory.h b/arch/arm/include/asm/memory.h
index cefedf0..bc2ff8b2 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
OpenPOWER on IntegriCloud