tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds 29ccb40f 6b779f8a

+11 -14
+2 -2
arch/alpha/include/asm/io.h
··· 534 534 535 535 #define ioread16be(p) swab16(ioread16(p)) 536 536 #define ioread32be(p) swab32(ioread32(p)) 537 + #define ioread64be(p) swab64(ioread64(p)) 537 538 #define iowrite16be(v,p) iowrite16(swab16(v), (p)) 538 539 #define iowrite32be(v,p) iowrite32(swab32(v), (p)) 540 + #define iowrite64be(v,p) iowrite64(swab64(v), (p)) 539 541 540 542 #define inb_p inb 541 543 #define inw_p inw ··· 636 634 */ 637 635 #define ioread64 ioread64 638 636 #define iowrite64 iowrite64 639 - #define ioread64be ioread64be 640 - #define iowrite64be iowrite64be 641 637 #define ioread8_rep ioread8_rep 642 638 #define ioread16_rep ioread16_rep 643 639 #define ioread32_rep ioread32_rep
+1 -1
arch/arm64/kernel/Makefile.syscalls
··· 1 1 # SPDX-License-Identifier: GPL-2.0 2 2 3 3 syscall_abis_32 += 4 - syscall_abis_64 += renameat newstat rlimit memfd_secret 4 + syscall_abis_64 += renameat rlimit memfd_secret 5 5 6 6 syscalltbl = arch/arm64/tools/syscall_%.tbl
+2 -1
arch/loongarch/kernel/Makefile.syscalls
··· 1 1 # SPDX-License-Identifier: GPL-2.0 2 2 3 - syscall_abis_64 += newstat 3 + # No special ABIs on loongarch so far 4 + syscall_abis_64 +=
+1 -1
arch/riscv/kernel/Makefile.syscalls
··· 1 1 # SPDX-License-Identifier: GPL-2.0 2 2 3 3 syscall_abis_32 += riscv memfd_secret 4 - syscall_abis_64 += riscv newstat rlimit memfd_secret 4 + syscall_abis_64 += riscv rlimit memfd_secret
+1 -1
arch/x86/entry/syscalls/syscall_64.tbl
··· 344 344 332 common statx sys_statx 345 345 333 common io_pgetevents sys_io_pgetevents 346 346 334 common rseq sys_rseq 347 + 335 common uretprobe sys_uretprobe 347 348 # don't use numbers 387 through 423, add new calls after the last 348 349 # 'common' entry 349 350 424 common pidfd_send_signal sys_pidfd_send_signal ··· 386 385 460 common lsm_set_self_attr sys_lsm_set_self_attr 387 386 461 common lsm_list_modules sys_lsm_list_modules 388 387 462 common mseal sys_mseal 389 - 467 common uretprobe sys_uretprobe 390 388 391 389 # 392 390 # Due to a historical design error, certain syscalls are numbered differently
+1 -4
include/uapi/asm-generic/unistd.h
··· 841 841 #define __NR_mseal 462 842 842 __SYSCALL(__NR_mseal, sys_mseal) 843 843 844 - #define __NR_uretprobe 463 845 - __SYSCALL(__NR_uretprobe, sys_uretprobe) 846 - 847 844 #undef __NR_syscalls 848 - #define __NR_syscalls 464 845 + #define __NR_syscalls 463 849 846 850 847 /* 851 848 * 32 bit systems traditionally used different
+2 -3
scripts/syscall.tbl
··· 98 98 77 common tee sys_tee 99 99 78 common readlinkat sys_readlinkat 100 100 79 stat64 fstatat64 sys_fstatat64 101 - 79 newstat fstatat sys_newfstatat 101 + 79 64 newfstatat sys_newfstatat 102 102 80 stat64 fstat64 sys_fstat64 103 - 80 newstat fstat sys_newfstat 103 + 80 64 newfstat sys_newfstat 104 104 81 common sync sys_sync 105 105 82 common fsync sys_fsync 106 106 83 common fdatasync sys_fdatasync ··· 402 402 460 common lsm_set_self_attr sys_lsm_set_self_attr 403 403 461 common lsm_list_modules sys_lsm_list_modules 404 404 462 common mseal sys_mseal 405 - 467 common uretprobe sys_uretprobe
+1 -1
tools/testing/selftests/bpf/prog_tests/uprobe_syscall.c
··· 216 216 } 217 217 218 218 #ifndef __NR_uretprobe 219 - #define __NR_uretprobe 467 219 + #define __NR_uretprobe 335 220 220 #endif 221 221 222 222 __naked unsigned long uretprobe_syscall_call_1(void)