diff options
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) | |||
274 | * translation for translating DMA addresses. Use the driver | 274 | * translation for translating DMA addresses. Use the driver |
275 | * DMA support - see dma-mapping.h. | 275 | * DMA support - see dma-mapping.h. |
276 | */ | 276 | */ |
277 | #define virt_to_phys virt_to_phys | ||
277 | static inline phys_addr_t virt_to_phys(const volatile void *x) | 278 | static inline phys_addr_t virt_to_phys(const volatile void *x) |
278 | { | 279 | { |
279 | return __virt_to_phys((unsigned long)(x)); | 280 | return __virt_to_phys((unsigned long)(x)); |
280 | } | 281 | } |
281 | 282 | ||
283 | #define phys_to_virt phys_to_virt | ||
282 | static inline void *phys_to_virt(phys_addr_t x) | 284 | static inline void *phys_to_virt(phys_addr_t x) |
283 | { | 285 | { |
284 | return (void *)__phys_to_virt(x); | 286 | return (void *)__phys_to_virt(x); |
@@ -322,11 +324,13 @@ static inline phys_addr_t __virt_to_idmap(unsigned long x) | |||
322 | #endif | 324 | #endif |
323 | 325 | ||
324 | #ifdef CONFIG_VIRT_TO_BUS | 326 | #ifdef CONFIG_VIRT_TO_BUS |
327 | #define virt_to_bus virt_to_bus | ||
325 | static inline __deprecated unsigned long virt_to_bus(void *x) | 328 | static inline __deprecated unsigned long virt_to_bus(void *x) |
326 | { | 329 | { |
327 | return __virt_to_bus((unsigned long)x); | 330 | return __virt_to_bus((unsigned long)x); |
328 | } | 331 | } |
329 | 332 | ||
333 | #define bus_to_virt bus_to_virt | ||
330 | static inline __deprecated void *bus_to_virt(unsigned long x) | 334 | static inline __deprecated void *bus_to_virt(unsigned long x) |
331 | { | 335 | { |
332 | return (void *)__bus_to_virt(x); | 336 | return (void *)__bus_to_virt(x); |