mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-03 21:45:08 -04:00
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
This commit is contained in:
@@ -53,6 +53,7 @@
|
||||
39 common umount2 sys_umount
|
||||
40 common mount sys_mount
|
||||
41 common pivot_root sys_pivot_root
|
||||
42 common nfsservctl sys_ni_syscall
|
||||
43 32 statfs64 sys_statfs64 compat_sys_statfs64
|
||||
43 64 statfs sys_statfs
|
||||
44 32 fstatfs64 sys_fstatfs64 compat_sys_fstatfs64
|
||||
@@ -100,7 +101,7 @@
|
||||
79 stat64 fstatat64 sys_fstatat64
|
||||
79 64 newfstatat sys_newfstatat
|
||||
80 stat64 fstat64 sys_fstat64
|
||||
80 64 newfstat sys_newfstat
|
||||
80 64 fstat sys_newfstat
|
||||
81 common sync sys_sync
|
||||
82 common fsync sys_fsync
|
||||
83 common fdatasync sys_fdatasync
|
||||
|
||||
Reference in New Issue
Block a user