diff options
| -rw-r--r-- | arch/mips/mm/ioremap.c | 4 | ||||
| -rw-r--r-- | include/asm-mips/io.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/mips/mm/ioremap.c b/arch/mips/mm/ioremap.c index 97bb6a734..12a83c24e 100644 --- a/arch/mips/mm/ioremap.c +++ b/arch/mips/mm/ioremap.c @@ -109,11 +109,11 @@ static int remap_area_pages(unsigned long address, unsigned long phys_addr, #define IS_LOW512(addr) (!((unsigned long)(addr) & ~0x1fffffffUL)) -void * __ioremap(unsigned long phys_addr, unsigned long size) +void * __ioremap(unsigned long phys_addr, unsigned long size, unsigned long flags) { void * addr; struct vm_struct * area; - unsigned long offset, last_addr, flags = _CACHE_UNCACHED; + unsigned long offset, last_addr; /* Don't allow wraparound or zero size */ last_addr = phys_addr + size - 1; diff --git a/include/asm-mips/io.h b/include/asm-mips/io.h index f89b4c754..6b308276b 100644 --- a/include/asm-mips/io.h +++ b/include/asm-mips/io.h @@ -130,16 +130,16 @@ extern inline void * bus_to_virt(unsigned long address) */ extern unsigned long isa_slot_offset; -extern void * __ioremap(unsigned long offset, unsigned long size); +extern void * __ioremap(unsigned long offset, unsigned long size, unsigned long flags); extern inline void *ioremap(unsigned long offset, unsigned long size) { - return __ioremap(offset, size); + return __ioremap(offset, size, _CACHE_UNCACHED); } extern inline void *ioremap_nocache(unsigned long offset, unsigned long size) { - return __ioremap(offset, size); + return __ioremap(offset, size, _CACHE_UNCACHED); } extern void iounmap(void *addr); |