diff options
| author | Nicolas Pitre <nico@cam.org> | 2008-09-05 16:05:14 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-11-28 15:36:48 +0000 |
| commit | 75f4aa15cf05ce6d99c8261cf57dcd749877fd1c (patch) | |
| tree | 0f2dca34ede47ab415fbaa954f6e976243493277 /arch | |
| parent | 252d4c276dc0895834af48743579cf19d1fa150b (diff) | |
| download | blackbird-op-linux-75f4aa15cf05ce6d99c8261cf57dcd749877fd1c.tar.gz blackbird-op-linux-75f4aa15cf05ce6d99c8261cf57dcd749877fd1c.zip | |
[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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/include/asm/memory.h | 2 |
1 files changed, 0 insertions, 2 deletions
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 |
