Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8cf81ff authored by Russell King's avatar Russell King
Browse files

Revert "[ARM] unconditionally define __virt_to_phys and __phys_to_virt" 



This reverts commit 75f4aa15.

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

Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 2fdc246a

arch/arm/include/asm/memory.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -125,8 +125,10 @@ 
 * private definitions which should NOT be used outside memory.h

 * private definitions which should NOT be used outside memory.h

 * files.  Use virt_to_phys/phys_to_virt/__pa/__va instead.

 * 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 __virt_to_phys(x)	((x) - PAGE_OFFSET + PHYS_OFFSET)

#define __phys_to_virt(x)	((x) - PHYS_OFFSET + PAGE_OFFSET)

#define __phys_to_virt(x)	((x) - PHYS_OFFSET + PAGE_OFFSET)

#endif





/*

/*

 * Convert a physical address to a Page Frame Number and back

 * Convert a physical address to a Page Frame Number and back