Re: [PATCH 5.4 000/189] 5.4.279-rc1 review

Arnd Bergmann
2024-07-03T18:35:01Z

On Wed, Jul 3, 2024, at 19:45, Naresh Kamboju wrote:
> On Wed, 3 Jul 2024 at 16:20, Greg Kroah-Hartman <gregkh@linuxfoundation.org> wrote:

> arch/sh/kernel/sys_sh32.c:68:1: error: macro "__MAP3" requires 4
> arguments, but only 2 given
> 68 | SC_ARG64(nbytes), unsigned int, flags)
> | ^
> In file included from arch/sh/kernel/sys_sh32.c:11:
> include/linux/syscalls.h:110: note: macro "__MAP3" defined here
> 110 | #define __MAP3(m,t,a,...) m(t,a), __MAP2(m,__VA_ARGS__)
> |

This is caused by the backport of my patch 30766f1105d6
("sh: rework sync_file_range ABI"), which uses the
SC_ARG64() that in turn was introduced in linux-5.12 commit
2ca408d9c749 ("fanotify: Fix sys_fanotify_mark() on native
x86-32").

We can't backport the entire fanotify patch to stable
kernels, but it would be fairly easy to just extract
the two macros from it, or to open-code them in the
backport of my patch.

For the moment, I'd suggest dropping my 30766f1105d6
patch from 5.10 and earlier LTS kernels to avoid the
build regression.

Rich and Adrian, let me know if you would submit a
tested backport stable@vger.kernel.org yourself, if you
want help backporting my patch, or if we should just
leave the existing state in the LTS kernels.

Arnd