summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJames Hogan <james.hogan@imgtec.com>2012-11-23 16:13:05 +0000
committerJames Hogan <james.hogan@imgtec.com>2013-03-02 20:09:14 +0000
commitc93d03123169357afde2d9b20dfbf9675295668f (patch)
tree88f05b0859830c331cfbff0c1908ac701d8e2a06 /include
parent19f949f52599ba7c3f67a5897ac6be14bfcb1200 (diff)
downloadlinux-c93d03123169357afde2d9b20dfbf9675295668f.tar.gz
linux-c93d03123169357afde2d9b20dfbf9675295668f.tar.bz2
linux-c93d03123169357afde2d9b20dfbf9675295668f.zip
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: James Hogan <james.hogan@imgtec.com> Acked-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'include')
-rw-r--r--include/asm-generic/io.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h
index 33bbbae4ddc6..cc76b3ecd206 100644
--- a/include/asm-generic/io.h
+++ b/include/asm-generic/io.h
@@ -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))