diff options
author | Borislav Petkov <bp@suse.de> | 2021-06-23 17:42:12 +0200 |
---|---|---|
committer | Borislav Petkov <bp@suse.de> | 2021-06-23 17:43:38 +0200 |
commit | c4cf5f61982e35348f522464010445efcc0aeb60 (patch) | |
tree | b3e65bfae5786e33ac82b30d6801983b10934a2f /arch/x86/entry/syscalls/syscall_32.tbl | |
parent | b7c11876d24bdd7ae3feeaa771b8f903f6cf05eb (diff) | |
parent | f9dfb5e390fab2df9f7944bb91e7705aba14cd26 (diff) |
Merge x86/urgent into x86/fpu
Pick up dependent changes which either went mainline (x86/urgent is
based on -rc7 and that contains them) as urgent fixes and the current
x86/urgent branch which contains two more urgent fixes, so that the
bigger FPU rework can base off ontop.
Signed-off-by: Borislav Petkov <bp@suse.de>
Diffstat (limited to 'arch/x86/entry/syscalls/syscall_32.tbl')
-rw-r--r-- | arch/x86/entry/syscalls/syscall_32.tbl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/entry/syscalls/syscall_32.tbl b/arch/x86/entry/syscalls/syscall_32.tbl index 28a1423ce32e..4bbc267fb36b 100644 --- a/arch/x86/entry/syscalls/syscall_32.tbl +++ b/arch/x86/entry/syscalls/syscall_32.tbl @@ -447,7 +447,7 @@ 440 i386 process_madvise sys_process_madvise 441 i386 epoll_pwait2 sys_epoll_pwait2 compat_sys_epoll_pwait2 442 i386 mount_setattr sys_mount_setattr -443 i386 quotactl_path sys_quotactl_path +# 443 reserved for quotactl_path 444 i386 landlock_create_ruleset sys_landlock_create_ruleset 445 i386 landlock_add_rule sys_landlock_add_rule 446 i386 landlock_restrict_self sys_landlock_restrict_self |