diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-04-03 13:11:36 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-04-03 13:11:36 +0200 |
| commit | cce81eac7fd0852d96ce0ce62cbe8f2b76d227f5 (patch) | |
| tree | b3ec5c9b08f41581185754ac199f0dcb9d6dda95 /0002-arch-wire-up-the-readfile-syscall.patch | |
| parent | 4a11ea0818f9d84b7b29693f27adaa5d020ffe25 (diff) | |
| download | patches-cce81eac7fd0852d96ce0ce62cbe8f2b76d227f5.tar.gz | |
update readfile and other patches to 5.12-rc5
Diffstat (limited to '0002-arch-wire-up-the-readfile-syscall.patch')
| -rw-r--r-- | 0002-arch-wire-up-the-readfile-syscall.patch | 120 |
1 files changed, 60 insertions, 60 deletions
diff --git a/0002-arch-wire-up-the-readfile-syscall.patch b/0002-arch-wire-up-the-readfile-syscall.patch index 687aad72dbc606..5b6b45f0ed9070 100644 --- a/0002-arch-wire-up-the-readfile-syscall.patch +++ b/0002-arch-wire-up-the-readfile-syscall.patch @@ -1,4 +1,4 @@ -From 7cb89db31b533823719673c881acb19d6b879f98 Mon Sep 17 00:00:00 2001 +From 8e475ba37dc1e5922dc4648bb42b1a36f692e440 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Date: Sun, 24 May 2020 12:36:21 +0200 Subject: [PATCH 2/4] arch: wire up the readfile syscall @@ -30,133 +30,133 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- a/arch/alpha/kernel/syscalls/syscall.tbl +++ b/arch/alpha/kernel/syscalls/syscall.tbl -@@ -481,3 +481,4 @@ - 549 common faccessat2 sys_faccessat2 +@@ -482,3 +482,4 @@ 550 common process_madvise sys_process_madvise 551 common epoll_pwait2 sys_epoll_pwait2 -+552 common readfile sys_readfile + 552 common mount_setattr sys_mount_setattr ++553 common readfile sys_readfile --- a/arch/arm/tools/syscall.tbl +++ b/arch/arm/tools/syscall.tbl -@@ -455,3 +455,4 @@ - 439 common faccessat2 sys_faccessat2 +@@ -456,3 +456,4 @@ 440 common process_madvise sys_process_madvise 441 common epoll_pwait2 sys_epoll_pwait2 -+442 common readfile sys_readfile + 442 common mount_setattr sys_mount_setattr ++443 common readfile sys_readfile --- a/arch/arm64/include/asm/unistd32.h +++ b/arch/arm64/include/asm/unistd32.h -@@ -891,6 +891,8 @@ __SYSCALL(__NR_faccessat2, sys_faccessat - __SYSCALL(__NR_process_madvise, sys_process_madvise) - #define __NR_epoll_pwait2 441 +@@ -893,6 +893,8 @@ __SYSCALL(__NR_process_madvise, sys_proc __SYSCALL(__NR_epoll_pwait2, compat_sys_epoll_pwait2) -+#define __NR_readfile 442 + #define __NR_mount_setattr 442 + __SYSCALL(__NR_mount_setattr, sys_mount_setattr) ++#define __NR_readfile 443 +__SYSCALL(__NR_readfile, sys_readfile) /* * Please add new compat syscalls above this comment and update --- a/arch/ia64/kernel/syscalls/syscall.tbl +++ b/arch/ia64/kernel/syscalls/syscall.tbl -@@ -362,3 +362,4 @@ - 439 common faccessat2 sys_faccessat2 +@@ -363,3 +363,4 @@ 440 common process_madvise sys_process_madvise 441 common epoll_pwait2 sys_epoll_pwait2 -+442 common readfile sys_readfile + 442 common mount_setattr sys_mount_setattr ++443 common readfile sys_readfile --- a/arch/m68k/kernel/syscalls/syscall.tbl +++ b/arch/m68k/kernel/syscalls/syscall.tbl -@@ -441,3 +441,4 @@ - 439 common faccessat2 sys_faccessat2 +@@ -442,3 +442,4 @@ 440 common process_madvise sys_process_madvise 441 common epoll_pwait2 sys_epoll_pwait2 -+442 common readfile sys_readfile + 442 common mount_setattr sys_mount_setattr ++443 common readfile sys_readfile --- a/arch/microblaze/kernel/syscalls/syscall.tbl +++ b/arch/microblaze/kernel/syscalls/syscall.tbl -@@ -447,3 +447,4 @@ - 439 common faccessat2 sys_faccessat2 +@@ -448,3 +448,4 @@ 440 common process_madvise sys_process_madvise 441 common epoll_pwait2 sys_epoll_pwait2 -+442 common readfile sys_readfile + 442 common mount_setattr sys_mount_setattr ++443 common readfile sys_readfile --- a/arch/mips/kernel/syscalls/syscall_n32.tbl +++ b/arch/mips/kernel/syscalls/syscall_n32.tbl -@@ -380,3 +380,4 @@ - 439 n32 faccessat2 sys_faccessat2 +@@ -381,3 +381,4 @@ 440 n32 process_madvise sys_process_madvise 441 n32 epoll_pwait2 compat_sys_epoll_pwait2 -+442 n32 readfile sys_readfile + 442 n32 mount_setattr sys_mount_setattr ++443 n32 readfile sys_readfile --- a/arch/mips/kernel/syscalls/syscall_n64.tbl +++ b/arch/mips/kernel/syscalls/syscall_n64.tbl -@@ -356,3 +356,4 @@ - 439 n64 faccessat2 sys_faccessat2 +@@ -357,3 +357,4 @@ 440 n64 process_madvise sys_process_madvise 441 n64 epoll_pwait2 sys_epoll_pwait2 -+442 n64 readfile sys_readfile + 442 n64 mount_setattr sys_mount_setattr ++443 n64 readfile sys_readfile --- a/arch/mips/kernel/syscalls/syscall_o32.tbl +++ b/arch/mips/kernel/syscalls/syscall_o32.tbl -@@ -429,3 +429,4 @@ - 439 o32 faccessat2 sys_faccessat2 +@@ -430,3 +430,4 @@ 440 o32 process_madvise sys_process_madvise 441 o32 epoll_pwait2 sys_epoll_pwait2 compat_sys_epoll_pwait2 -+442 o32 readfile sys_readfile + 442 o32 mount_setattr sys_mount_setattr ++443 o32 readfile sys_readfile --- a/arch/parisc/kernel/syscalls/syscall.tbl +++ b/arch/parisc/kernel/syscalls/syscall.tbl -@@ -439,3 +439,4 @@ - 439 common faccessat2 sys_faccessat2 +@@ -440,3 +440,4 @@ 440 common process_madvise sys_process_madvise 441 common epoll_pwait2 sys_epoll_pwait2 compat_sys_epoll_pwait2 -+442 common readfile sys_readfile + 442 common mount_setattr sys_mount_setattr ++443 common readfile sys_readfile --- a/arch/powerpc/kernel/syscalls/syscall.tbl +++ b/arch/powerpc/kernel/syscalls/syscall.tbl -@@ -531,3 +531,4 @@ - 439 common faccessat2 sys_faccessat2 +@@ -522,3 +522,4 @@ 440 common process_madvise sys_process_madvise 441 common epoll_pwait2 sys_epoll_pwait2 compat_sys_epoll_pwait2 -+442 common readfile sys_readfile + 442 common mount_setattr sys_mount_setattr ++443 common readfile sys_readfile --- a/arch/s390/kernel/syscalls/syscall.tbl +++ b/arch/s390/kernel/syscalls/syscall.tbl -@@ -444,3 +444,4 @@ - 439 common faccessat2 sys_faccessat2 sys_faccessat2 +@@ -445,3 +445,4 @@ 440 common process_madvise sys_process_madvise sys_process_madvise 441 common epoll_pwait2 sys_epoll_pwait2 compat_sys_epoll_pwait2 -+442 common readfile sys_readfile sys_readfile + 442 common mount_setattr sys_mount_setattr sys_mount_setattr ++443 common readfile sys_readfile sys_readfile --- a/arch/sh/kernel/syscalls/syscall.tbl +++ b/arch/sh/kernel/syscalls/syscall.tbl -@@ -444,3 +444,4 @@ - 439 common faccessat2 sys_faccessat2 +@@ -445,3 +445,4 @@ 440 common process_madvise sys_process_madvise 441 common epoll_pwait2 sys_epoll_pwait2 -+442 common readfile sys_readfile + 442 common mount_setattr sys_mount_setattr ++443 common readfile sys_readfile --- a/arch/sparc/kernel/syscalls/syscall.tbl +++ b/arch/sparc/kernel/syscalls/syscall.tbl -@@ -487,3 +487,4 @@ - 439 common faccessat2 sys_faccessat2 +@@ -488,3 +488,4 @@ 440 common process_madvise sys_process_madvise 441 common epoll_pwait2 sys_epoll_pwait2 compat_sys_epoll_pwait2 -+442 common readfile sys_readfile + 442 common mount_setattr sys_mount_setattr ++443 common readfile sys_readfile --- a/arch/x86/entry/syscalls/syscall_32.tbl +++ b/arch/x86/entry/syscalls/syscall_32.tbl -@@ -446,3 +446,4 @@ - 439 i386 faccessat2 sys_faccessat2 +@@ -447,3 +447,4 @@ 440 i386 process_madvise sys_process_madvise 441 i386 epoll_pwait2 sys_epoll_pwait2 compat_sys_epoll_pwait2 -+442 i386 readfile sys_readfile + 442 i386 mount_setattr sys_mount_setattr ++443 i386 readfile sys_readfile --- a/arch/x86/entry/syscalls/syscall_64.tbl +++ b/arch/x86/entry/syscalls/syscall_64.tbl -@@ -363,6 +363,7 @@ - 439 common faccessat2 sys_faccessat2 +@@ -364,6 +364,7 @@ 440 common process_madvise sys_process_madvise 441 common epoll_pwait2 sys_epoll_pwait2 -+442 common readfile sys_readfile + 442 common mount_setattr sys_mount_setattr ++443 common readfile sys_readfile # # Due to a historical design error, certain syscalls are numbered differently --- a/arch/xtensa/kernel/syscalls/syscall.tbl +++ b/arch/xtensa/kernel/syscalls/syscall.tbl -@@ -412,3 +412,4 @@ - 439 common faccessat2 sys_faccessat2 +@@ -413,3 +413,4 @@ 440 common process_madvise sys_process_madvise 441 common epoll_pwait2 sys_epoll_pwait2 -+442 common readfile sys_readfile + 442 common mount_setattr sys_mount_setattr ++443 common readfile sys_readfile --- a/include/linux/syscalls.h +++ b/include/linux/syscalls.h -@@ -1037,6 +1037,8 @@ asmlinkage long sys_pidfd_send_signal(in +@@ -1041,6 +1041,8 @@ asmlinkage long sys_pidfd_send_signal(in siginfo_t __user *info, unsigned int flags); asmlinkage long sys_pidfd_getfd(int pidfd, int fd, unsigned int flags); @@ -167,16 +167,16 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> * Architecture-specific system calls --- a/include/uapi/asm-generic/unistd.h +++ b/include/uapi/asm-generic/unistd.h -@@ -861,9 +861,11 @@ __SYSCALL(__NR_faccessat2, sys_faccessat - __SYSCALL(__NR_process_madvise, sys_process_madvise) - #define __NR_epoll_pwait2 441 +@@ -863,9 +863,11 @@ __SYSCALL(__NR_process_madvise, sys_proc __SC_COMP(__NR_epoll_pwait2, sys_epoll_pwait2, compat_sys_epoll_pwait2) -+#define __NR_readfile 442 + #define __NR_mount_setattr 442 + __SYSCALL(__NR_mount_setattr, sys_mount_setattr) ++#define __NR_readfile 443 +__SYSCALL(__NR_readfile, sys_readfile) #undef __NR_syscalls --#define __NR_syscalls 442 -+#define __NR_syscalls 443 +-#define __NR_syscalls 443 ++#define __NR_syscalls 444 /* * 32 bit systems traditionally used different |