Skip to content

Commit

Permalink
asm-generic: add MMU variants of io.h functions
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jonas Bonn committed Jul 22, 2011
1 parent a4e0527 commit f1ecc69
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion include/asm-generic/io.h
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,11 @@ static inline void *phys_to_virt(unsigned long 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)
{
return (void __iomem*) (unsigned long)offset;
Expand All @@ -326,6 +330,7 @@ static inline void __iomem *ioremap(phys_addr_t offset, unsigned long size)
static inline void iounmap(void *addr)
{
}
#endif /* CONFIG_MMU */

#ifndef CONFIG_GENERIC_IOMAP
static inline void __iomem *ioport_map(unsigned long port, unsigned int nr)
Expand All @@ -342,7 +347,7 @@ extern void ioport_unmap(void __iomem *p);
#endif /* CONFIG_GENERIC_IOMAP */

#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
static inline unsigned long virt_to_bus(volatile void *address)
Expand Down

0 comments on commit f1ecc69

Please sign in to comment.