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

Commit c93d0312 authored by James Hogan's avatar James Hogan
Browse files

asm-generic/io.h: check CONFIG_VIRT_TO_BUS 



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: default avatarJames Hogan <james.hogan@imgtec.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 19f949f5

include/asm-generic/io.h

+2 −0
Original line number Diff line number Diff line
@@ -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))