Commit adfbe364 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'asm-generic-fixes-6.10' of... 

Merge tag 'asm-generic-fixes-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic

Pull asm-generic fixes from Arnd Bergmann:
 "These are some bugfixes for system call ABI issues I found while
  working on a cleanup series. None of these are urgent since these bugs
  have gone unnoticed for many years, but I think we probably want to
  backport them all to stable kernels, so it makes sense to have the
  fixes included as early as possible.

  One more fix addresses a compile-time warning in kallsyms that was
  uncovered by a patch I did to enable additional warnings in 6.10. I
  had mistakenly thought that this fix was already merged through the
  module tree, but as Geert pointed out it was still missing"

* tag 'asm-generic-fixes-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
  kallsyms: rework symbol lookup return codes
  linux/syscalls.h: add missing __user annotations
  syscalls: mmap(): use unsigned offset type consistently
  s390: remove native mmap2() syscall
  hexagon: fix fadvise64_64 calling conventions
  csky, hexagon: fix broken sys_sync_file_range
  sh: rework sync_file_range ABI
  powerpc: restore some missing spu syscalls
  parisc: use generic sys_fanotify_mark implementation
  parisc: use correct compat recv/recvfrom syscalls
  sparc: fix compat recv/recvfrom syscalls
  sparc: fix old compat_sys_select()
  syscalls: fix compat_sys_io_pgetevents_time64 usage
  ftruncate: pass a signed offset
parents 66e55ff1 7e1f4eb9

arch/arm64/include/asm/unistd32.h

+1 −1
Original line number Diff line number Diff line
@@ -840,7 +840,7 @@ __SYSCALL(__NR_pselect6_time64, compat_sys_pselect6_time64) 
#define __NR_ppoll_time64 414

__SYSCALL(__NR_ppoll_time64, compat_sys_ppoll_time64)

#define __NR_io_pgetevents_time64 416

__SYSCALL(__NR_io_pgetevents_time64, sys_io_pgetevents)

__SYSCALL(__NR_io_pgetevents_time64, compat_sys_io_pgetevents_time64)

#define __NR_recvmmsg_time64 417

__SYSCALL(__NR_recvmmsg_time64, compat_sys_recvmmsg_time64)

#define __NR_mq_timedsend_time64 418

arch/csky/include/uapi/asm/unistd.h

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
#define __ARCH_WANT_SYS_CLONE3

#define __ARCH_WANT_SET_GET_RLIMIT

#define __ARCH_WANT_TIME32_SYSCALLS

#define __ARCH_WANT_SYNC_FILE_RANGE2

#include <asm-generic/unistd.h>



#define __NR_set_thread_area	(__NR_arch_specific_syscall + 0)

arch/csky/kernel/syscall.c

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ SYSCALL_DEFINE6(mmap2, 
	unsigned long, prot,

	unsigned long, flags,

	unsigned long, fd,

	off_t, offset)

	unsigned long, offset)

{

	if (unlikely(offset & (~PAGE_MASK >> 12)))

		return -EINVAL;

arch/hexagon/include/asm/syscalls.h

0 → 100644
+6 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */



#include <asm-generic/syscalls.h>



asmlinkage long sys_hexagon_fadvise64_64(int fd, int advice,

	                                  u32 a2, u32 a3, u32 a4, u32 a5);

arch/hexagon/include/uapi/asm/unistd.h

+1 −0
Original line number Diff line number Diff line
@@ -36,5 +36,6 @@ 
#define __ARCH_WANT_SYS_VFORK

#define __ARCH_WANT_SYS_FORK

#define __ARCH_WANT_TIME32_SYSCALLS

#define __ARCH_WANT_SYNC_FILE_RANGE2



#include <asm-generic/unistd.h>