diff options
| author | Thierry Reding <treding@nvidia.com> | 2014-07-28 16:34:18 +0200 |
|---|---|---|
| committer | Thierry Reding <treding@nvidia.com> | 2014-11-10 15:59:23 +0100 |
| commit | 84c4d3a6d438f59438e15cc046fe1a7cafc9069a (patch) | |
| tree | 3542e0c8719e79d0aec3cbfb91e59dcf8103d621 /arch/arm/include/asm/memory.h | |
| parent | 9ab3a7a0d2b417773e8e8a880fc3a69f7fc1f57a (diff) | |
| download | linux-84c4d3a6d438f59438e15cc046fe1a7cafc9069a.tar.bz2 | |
ARM: Use include/asm-generic/io.h
Include the generic I/O header file so that duplicate implementations
can be removed. This will also help to establish consistency across more
architectures regarding which accessors they support.
Signed-off-by: Thierry Reding <treding@nvidia.com>
Diffstat (limited to 'arch/arm/include/asm/memory.h')
| -rw-r--r-- | arch/arm/include/asm/memory.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/include/asm/memory.h b/arch/arm/include/asm/memory.h index e731018869a7..184def0e1652 100644 --- a/arch/arm/include/asm/memory.h +++ b/arch/arm/include/asm/memory.h @@ -274,11 +274,13 @@ static inline unsigned long __phys_to_virt(phys_addr_t x) * translation for translating DMA addresses. Use the driver * DMA support - see dma-mapping.h. */ +#define virt_to_phys virt_to_phys static inline phys_addr_t virt_to_phys(const volatile void *x) { return __virt_to_phys((unsigned long)(x)); } +#define phys_to_virt phys_to_virt static inline void *phys_to_virt(phys_addr_t x) { return (void *)__phys_to_virt(x); @@ -322,11 +324,13 @@ static inline phys_addr_t __virt_to_idmap(unsigned long x) #endif #ifdef CONFIG_VIRT_TO_BUS +#define virt_to_bus virt_to_bus static inline __deprecated unsigned long virt_to_bus(void *x) { return __virt_to_bus((unsigned long)x); } +#define bus_to_virt bus_to_virt static inline __deprecated void *bus_to_virt(unsigned long x) { return (void *)__bus_to_virt(x); |