On Wed, Jul 10, 2024 at 6:27 PM Arnd Bergmann <arnd@xxxxxxxx> wrote: > > On Thu, Jul 4, 2024, at 16:36, Arnd Bergmann wrote: > > - > > -#define __NR_set_thread_area (__NR_arch_specific_syscall + 0) > > -__SYSCALL(__NR_set_thread_area, sys_set_thread_area) > > -#define __NR_cacheflush (__NR_arch_specific_syscall + 1) > > -__SYSCALL(__NR_cacheflush, sys_cacheflush) > > +#include <asm/unistd_32.h> > > +#define __NR_sync_file_range2 __NR_sync_file_range > > A small update: I have folded this fixup into this patch > and the hexagon one, to ensure we don't define both > __NR_sync_file_range2 and __NR_sync_file_range. I already > have patches to clean this up further to avoid both the > #undef and #define, but that is part of a larger rework > that is not ready before the merge window. > > Arnd > > diff --git a/arch/csky/include/uapi/asm/unistd.h b/arch/csky/include/uapi/asm/unistd.h > index 794adbc04e48..44882179a6e1 100644 > --- a/arch/csky/include/uapi/asm/unistd.h > +++ b/arch/csky/include/uapi/asm/unistd.h > @@ -1,4 +1,6 @@ > /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ > > #include <asm/unistd_32.h> > -#define __NR_sync_file_range2 __NR_sync_file_range > + > +#define __NR_sync_file_range2 84 > +#undef __NR_sync_file_range For csky part: Acked-by: Guo Ren <guoren@xxxxxxxxxx> > diff --git a/arch/hexagon/include/uapi/asm/unistd.h b/arch/hexagon/include/uapi/asm/unistd.h > index 6f670347dd61..a3b0cac25580 100644 > --- a/arch/hexagon/include/uapi/asm/unistd.h > +++ b/arch/hexagon/include/uapi/asm/unistd.h > @@ -29,4 +29,5 @@ > > #include <asm/unistd_32.h> > > -#define __NR_sync_file_range2 __NR_sync_file_range > +#define __NR_sync_file_range2 84 > +#undef __NR_sync_file_range -- Best Regards Guo Ren
