Skip to content

Commit 58d40f5

Browse files
committed
Merge tag 'asm-generic-fixes-6.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic
Pull asm-generic fixes from Arnd Bergmann: "There are two more changes to the syscall.tbl conversion: the '__NR_newfstat' in the previous bugfix was a mistake and gets reverted now, after triple-checking that the contents are now back to what they were on all architectures. The __NR_nfsservctl definition is not really needed but came up in the same discussion as it had previously been defined in uapi/asm-generic/unistd.h and tested for in user space. There are a few more symbols that used to be defined in the old unistd.h file, but that are never defined on any other architecture using syscall.tbl format. These used to be needed inside of the kernel: __NR_syscalls __NR_arch_specific_syscall __NR3264_* Searching for these on https://codesearch.debian.net/ shows a few packages (rustc, golang, clamav, libseccomp, librsvg, strace) that duplicate all the macros from asm/unistd.h, but nothing that actually uses the macros, so I concluded that they are fine to omit after all" * tag 'asm-generic-fixes-6.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic: syscalls: add back legacy __NR_nfsservctl macro syscalls: fix fstat() entry again
2 parents 0f135d3 + b82c1d2 commit 58d40f5

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

scripts/syscall.tbl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
39 common umount2 sys_umount
5454
40 common mount sys_mount
5555
41 common pivot_root sys_pivot_root
56+
42 common nfsservctl sys_ni_syscall
5657
43 32 statfs64 sys_statfs64 compat_sys_statfs64
5758
43 64 statfs sys_statfs
5859
44 32 fstatfs64 sys_fstatfs64 compat_sys_fstatfs64
@@ -100,7 +101,7 @@
100101
79 stat64 fstatat64 sys_fstatat64
101102
79 64 newfstatat sys_newfstatat
102103
80 stat64 fstat64 sys_fstat64
103-
80 64 newfstat sys_newfstat
104+
80 64 fstat sys_newfstat
104105
81 common sync sys_sync
105106
82 common fsync sys_fsync
106107
83 common fdatasync sys_fdatasync

0 commit comments

Comments
 (0)