From: Nicolas Pitre <nico@cam.org>
Date: Fri, 5 Sep 2008 20:05:14 +0000 (-0400)
Subject: [ARM] unconditionally define __virt_to_phys and __phys_to_virt
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=75f4aa15cf05ce6d99c8261cf57dcd749877fd1c;p=openwrt%2Fstaging%2Fblogic.git

[ARM] unconditionally define __virt_to_phys and __phys_to_virt

There is no machine class overriding this.  If non linear translations
are implemented again for some machines then this could be restored at
that time.

Signed-off-by: Nicolas Pitre <nico@marvell.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 77764301844b..7238b3b50643 100644
--- a/arch/arm/include/asm/memory.h
+++ b/arch/arm/include/asm/memory.h
@@ -112,10 +112,8 @@
  * 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