In preparation for removing ioremap_cache() introduce arch_memremap() for ia64. Given that ia64 does not allow external control for caching types, this simply aliases arch_memremap() with the ia64 ioremap() implementation.
Cc: Arnd Bergmann <[email protected]> Cc: Tony Luck <[email protected]> Cc: Ross Zwisler <[email protected]> Signed-off-by: Dan Williams <[email protected]> --- arch/ia64/Kconfig | 1 + arch/ia64/mm/ioremap.c | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index eb0249e37981..b39bab1da7dd 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig @@ -52,6 +52,7 @@ config IA64 select HAVE_MOD_ARCH_SPECIFIC select MODULES_USE_ELF_RELA select ARCH_USE_CMPXCHG_LOCKREF + select ARCH_HAS_MEMREMAP select HAVE_ARCH_AUDITSYSCALL default y help diff --git a/arch/ia64/mm/ioremap.c b/arch/ia64/mm/ioremap.c index 43964cde6214..53a1faa0e5da 100644 --- a/arch/ia64/mm/ioremap.c +++ b/arch/ia64/mm/ioremap.c @@ -101,6 +101,16 @@ ioremap (unsigned long phys_addr, unsigned long size) } EXPORT_SYMBOL(ioremap); +/* + * Cache mapping-type is determined internal to ioremap and can't be + * externally specified + */ +void *arch_memremap(resource_size_t offset, size_t size, unsigned long flags) +{ + return (void __force *) ioremap(offset, size); +} +EXPORT_SYMBOL(arch_memremap); + void __iomem * ioremap_nocache (unsigned long phys_addr, unsigned long size) { -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/

