On Wed, Feb 21, 2018 at 12:21 PM, Greentime Hu <green...@gmail.com> wrote:
> 2018-02-16 18:47 GMT+08:00 kbuild test robot <l...@intel.com>:
>
> From: Greentime Hu <greent...@andestech.com>
> Date: Wed, 21 Feb 2018 14:21:23 +0800
> Subject: [PATCH] xtensa: add ioremap_nocache declaration before include
> asm-generic/io.h.
>
> A future commit for the nds32 architecture bootstrap("asm-generic/io.h:
> move ioremap_nocache/ioremap_uc/ioremap_wc/ioremap_wt out of ifndef
> CONFIG_MMU") will move the ioremap_nocache out of the CONFIG_MMU ifdef.
> This means that in order to suppress re-definition errors we need to
> setup #define's before importing asm-generic/io.h.
>
> Signed-off-by: Greentime Hu <greent...@andestech.com>
Don't you need to override both ioremap and ioremap_nocache?
> ---
> arch/xtensa/include/asm/io.h | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/arch/xtensa/include/asm/io.h b/arch/xtensa/include/asm/io.h
> index c38e5a732d86..acc5bb2cf1c7 100644
> --- a/arch/xtensa/include/asm/io.h
> +++ b/arch/xtensa/include/asm/io.h
> @@ -52,6 +52,7 @@ static inline void __iomem *ioremap_cache(unsigned
> long offset,
> return xtensa_ioremap_cache(offset, size);
> }
> #define ioremap_cache ioremap_cache
> +#define ioremap_nocache ioremap_nocache
>
> #define ioremap_wc ioremap_nocache
