Skip to content

Commit

Permalink
asm-generic/io.h: check CONFIG_VIRT_TO_BUS
Browse files Browse the repository at this point in the history
Make asm-generic/io.h check CONFIG_VIRT_TO_BUS before defining
virt_to_bus() and bus_to_virt(), otherwise it's easy to accidentally
have a silently failing incorrect direct mapped definition rather then
no definition at all.

Signed-off-by: James Hogan <james.hogan@imgtec.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
  • Loading branch information
James Hogan committed Mar 2, 2013
1 parent 19f949f commit c93d031
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions include/asm-generic/io.h
Original file line number Diff line number Diff line change
@@ -332,6 +332,7 @@ extern void ioport_unmap(void __iomem *p);
#define xlate_dev_kmem_ptr(p) p
#define xlate_dev_mem_ptr(p) __va(p)

#ifdef CONFIG_VIRT_TO_BUS
#ifndef virt_to_bus
static inline unsigned long virt_to_bus(volatile void *address)
{
@@ -343,6 +344,7 @@ static inline void *bus_to_virt(unsigned long address)
return (void *) address;
}
#endif
#endif

#ifndef memset_io
#define memset_io(a, b, c) memset(__io_virt(a), (b), (c))

0 comments on commit c93d031

Please sign in to comment.