Re: [PATCH v6 10/19] s390: mm: Convert to GENERIC_IOREMAP

Alexander Gordeev
2023-06-21T14:53:39Z

On Sun, Jun 11, 2023 at 07:10:44PM +0800, Baoquan He wrote:

Hi Baoquan,

> From 26aedf424dac7e58dd1389e554cfe0693e2b371f Mon Sep 17 00:00:00 2001
> From: Baoquan He <bhe@redhat.com>
> Date: Sun, 11 Jun 2023 18:37:43 +0800
> Subject: [PATCH] s390: mm: fix building error when converting to
> GENERIC_IOREMAP
> Content-type: text/plain
>
> We should always include <asm/io.h> in ARCH, but not <asm-generic/io.h>
> directly. Otherwise, macro defined by ARCH won't be seen and could cause
> building error.
>
> Reported-by: kernel test robot <lkp@intel.com>
> Closes: https://lore.kernel.org/oe-kbuild-all/202306100105.8GHnoMCP-lkp@intel.com/
> Signed-off-by: Baoquan He <bhe@redhat.com>
> ---
> arch/s390/kernel/perf_cpum_sf.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/s390/kernel/perf_cpum_sf.c b/arch/s390/kernel/perf_cpum_sf.c
> index 7ef72f5ff52e..b0269f3881aa 100644
> --- a/arch/s390/kernel/perf_cpum_sf.c
> +++ b/arch/s390/kernel/perf_cpum_sf.c
> @@ -22,7 +22,7 @@
> #include <asm/irq.h>
> #include <asm/debug.h>
> #include <asm/timex.h>
> -#include <asm-generic/io.h>
> +#include <asm/io.h>
>
> /* Minimum number of sample-data-block-tables:
> * At least one table is required for the sampling buffer structure.

Applied, thanks!