Re: [RFC] arm64: ioremap: add ioremap_cache macro

[Arnd Bergmann]

On Tuesday 13 October 2015 15:10:55 Catalin Marinas wrote:
> On Mon, Oct 12, 2015 at 10:28:18AM +0800, yalin wang wrote:
> > Add ioremap_cache macro, because some code will test if this macro
> > is defined or not, and will generate a generric version if not defined,
> > for example, memremap.c do like this.
> > 
> > Signed-off-by: yalin wang <yalin.wang2010@xxxxxxxxx>
> > ---
> >  arch/arm64/include/asm/io.h | 1 +
> >  1 file changed, 1 insertion(+)
> > 
> > diff --git a/arch/arm64/include/asm/io.h b/arch/arm64/include/asm/io.h
> > index 44be1e0..d6b620c 100644
> > --- a/arch/arm64/include/asm/io.h
> > +++ b/arch/arm64/include/asm/io.h
> > @@ -172,6 +172,7 @@ extern void __iomem *ioremap_cache(phys_addr_t phys_addr, size_t size);
> >  #define ioremap_wc(addr, size)               __ioremap((addr), (size), __pgprot(PROT_NORMAL_NC))
> >  #define ioremap_wt(addr, size)               __ioremap((addr), (size), __pgprot(PROT_DEVICE_nGnRE))
> >  #define iounmap                              __iounmap
> > +#define ioremap_cache                  ioremap_cache
> 
> Applied. Thanks.
> 

I think this will conflict with Dan Williams' series that removes
ioremap_cache from the kernel and replaces it with memremap.c

	Arnd
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/