Subject: [PATCH v2 18/25] libnvdimm, pmem: switch from ioremap_cache to memremap

From: [email-masked] (Ross Zwisler)
Date: Tue, 28 Jul 2015 16:51:29 -0600

On Fri, 2015-07-24 at 22:39 -0400, Dan Williams wrote:
> In preparation for deprecating ioremap_cache() convert its usage in
> libnvdimm and the PMEM API to memremap.
> 
> Signed-off-by: Dan Williams <[email-masked]>
> ---
>  arch/x86/include/asm/io.h         |    7 +------
>  arch/x86/mm/ioremap.c             |    6 ++++++
>  tools/testing/nvdimm/Kbuild       |    2 +-
>  tools/testing/nvdimm/test/iomap.c |    6 +++---
>  4 files changed, 11 insertions(+), 10 deletions(-)
> 
> diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
> index cc9c61bc1abe..8aeb6456188a 100644
> --- a/arch/x86/include/asm/io.h
> +++ b/arch/x86/include/asm/io.h
> @@ -248,12 +248,7 @@ static inline void flush_write_buffers(void)
>  #endif
>  }
>  
> -static inline void __pmem *arch_memremap_pmem(resource_size_t offset,
> -	unsigned long size)
> -{
> -	return (void __force __pmem *) ioremap_cache(offset, size);
> -}
> -
> +void __pmem *arch_memremap_pmem(resource_size_t offset, size_t size);
>  #endif /* __KERNEL__ */
>  
>  extern void native_io_delay(void);
> diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
> index 6f759c7c2ab7..7b422e7574b1 100644
> --- a/arch/x86/mm/ioremap.c
> +++ b/arch/x86/mm/ioremap.c
> @@ -317,6 +317,12 @@ void __iomem *ioremap_cache(resource_size_t phys_addr, unsigned long size)
>  }
>  EXPORT_SYMBOL(ioremap_cache);
>  
> +void __pmem *arch_memremap_pmem(resource_size_t offset, size_t size)
> +{
> +	return (void __force __pmem *) ioremap_cache(offset, size);

Did you mean for this to be a call to memremap() instead of ioremap_cache()?