Commit 29ccb40f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'asm-generic-fixes-6.11-1' of... 

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

Pull asm-generic fixes from Arnd Bergmann:
 "These are three important bug fixes for the cross-architecture tree,
  fixing a regression with the new syscall.tbl file, the inconsistent
  numbering for the new uretprobe syscall and a bug with iowrite64be on
  alpha"

* tag 'asm-generic-fixes-6.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
  syscalls: fix syscall macros for newfstat/newfstatat
  uretprobe: change syscall number, again
  alpha: fix ioread64be()/iowrite64be() helpers
parents 6b779f8a 343416f0

arch/alpha/include/asm/io.h

+2 −2
Original line number Diff line number Diff line
@@ -534,8 +534,10 @@ extern inline void writeq(u64 b, volatile void __iomem *addr) 


#define ioread16be(p) swab16(ioread16(p))

#define ioread32be(p) swab32(ioread32(p))

#define ioread64be(p) swab64(ioread64(p))

#define iowrite16be(v,p) iowrite16(swab16(v), (p))

#define iowrite32be(v,p) iowrite32(swab32(v), (p))

#define iowrite64be(v,p) iowrite64(swab64(v), (p))



#define inb_p		inb

#define inw_p		inw
@@ -634,8 +636,6 @@ extern void outsl (unsigned long port, const void *src, unsigned long count); 
 */

#define ioread64 ioread64

#define iowrite64 iowrite64

#define ioread64be ioread64be

#define iowrite64be iowrite64be

#define ioread8_rep ioread8_rep

#define ioread16_rep ioread16_rep

#define ioread32_rep ioread32_rep

arch/arm64/kernel/Makefile.syscalls

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0



syscall_abis_32 +=

syscall_abis_64 += renameat newstat rlimit memfd_secret

syscall_abis_64 += renameat rlimit memfd_secret



syscalltbl = arch/arm64/tools/syscall_%.tbl

arch/loongarch/kernel/Makefile.syscalls

+2 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0



syscall_abis_64 += newstat
 
# No special ABIs on loongarch so far

syscall_abis_64 +=

arch/riscv/kernel/Makefile.syscalls

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0



syscall_abis_32 += riscv memfd_secret

syscall_abis_64 += riscv newstat rlimit memfd_secret
 
syscall_abis_64 += riscv rlimit memfd_secret

arch/x86/entry/syscalls/syscall_64.tbl

+1 −1
Original line number Diff line number Diff line
@@ -344,6 +344,7 @@ 
332	common	statx			sys_statx

333	common	io_pgetevents		sys_io_pgetevents

334	common	rseq			sys_rseq

335	common	uretprobe		sys_uretprobe

# don't use numbers 387 through 423, add new calls after the last

# 'common' entry

424	common	pidfd_send_signal	sys_pidfd_send_signal
@@ -385,7 +386,6 @@ 
460	common	lsm_set_self_attr	sys_lsm_set_self_attr

461	common	lsm_list_modules	sys_lsm_list_modules

462 	common  mseal			sys_mseal

467	common	uretprobe		sys_uretprobe



#

# Due to a historical design error, certain syscalls are numbered differently