浏览代码

asm-generic: add MMU variants of io.h functions

Some of the implementations, in particular the ioremap variants, in
asm-generic/io.h are for systems without an MMU.  In order to be able to
use the generic header file for systems with an MMU, this patch wraps
these implementations in checks for CONFIG_MMU.

Tested on OpenRISC.

Signed-off-by: Jonas Bonn <jonas@southpole.se>
Cc: liqin.chen@sunplusct.com
Cc: gxt@mprc.pku.edu.cn
Acked-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Jonas Bonn 14 年之前
父节点
当前提交
f1ecc69838
共有 1 个文件被更改,包括 6 次插入1 次删除
  1. 6 1
      include/asm-generic/io.h

+ 6 - 1
include/asm-generic/io.h

@@ -307,7 +307,11 @@ static inline void *phys_to_virt(unsigned long address)
 
 
 /*
 /*
  * Change "struct page" to physical address.
  * Change "struct page" to physical address.
+ *
+ * This implementation is for the no-MMU case only... if you have an MMU
+ * you'll need to provide your own definitions.
  */
  */
+#ifndef CONFIG_MMU
 static inline void __iomem *ioremap(phys_addr_t offset, unsigned long size)
 static inline void __iomem *ioremap(phys_addr_t offset, unsigned long size)
 {
 {
 	return (void __iomem*) (unsigned long)offset;
 	return (void __iomem*) (unsigned long)offset;
@@ -326,6 +330,7 @@ static inline void __iomem *ioremap(phys_addr_t offset, unsigned long size)
 static inline void iounmap(void *addr)
 static inline void iounmap(void *addr)
 {
 {
 }
 }
+#endif /* CONFIG_MMU */
 
 
 #ifndef CONFIG_GENERIC_IOMAP
 #ifndef CONFIG_GENERIC_IOMAP
 static inline void __iomem *ioport_map(unsigned long port, unsigned int nr)
 static inline void __iomem *ioport_map(unsigned long port, unsigned int nr)
@@ -342,7 +347,7 @@ extern void ioport_unmap(void __iomem *p);
 #endif /* CONFIG_GENERIC_IOMAP */
 #endif /* CONFIG_GENERIC_IOMAP */
 
 
 #define xlate_dev_kmem_ptr(p)	p
 #define xlate_dev_kmem_ptr(p)	p
-#define xlate_dev_mem_ptr(p)	((void *) (p))
+#define xlate_dev_mem_ptr(p)	__va(p)
 
 
 #ifndef virt_to_bus
 #ifndef virt_to_bus
 static inline unsigned long virt_to_bus(volatile void *address)
 static inline unsigned long virt_to_bus(volatile void *address)