mirror of
https://github.com/lkl/linux.git
synced 2025-12-19 08:03:01 +09:00
Merge tag 'v5.13' into merge-5.18-t3
Linux 5.13 Conflicts: lib/.gitignore scripts/.gitignore scripts/basic/.gitignore scripts/kconfig/.gitignore Signed-off-by: Hajime Tazaki <thehajime@gmail.com>
This commit is contained in:
@@ -69,6 +69,8 @@ struct io_uring_params;
|
||||
struct clone_args;
|
||||
struct open_how;
|
||||
struct mount_attr;
|
||||
struct landlock_ruleset_attr;
|
||||
enum landlock_rule_type;
|
||||
|
||||
#include <linux/types.h>
|
||||
#include <linux/aio_abi.h>
|
||||
@@ -489,6 +491,8 @@ asmlinkage long sys_pipe2(int __user *fildes, int flags);
|
||||
/* fs/quota.c */
|
||||
asmlinkage long sys_quotactl(unsigned int cmd, const char __user *special,
|
||||
qid_t id, void __user *addr);
|
||||
asmlinkage long sys_quotactl_path(unsigned int cmd, const char __user *mountpoint,
|
||||
qid_t id, void __user *addr);
|
||||
|
||||
/* fs/readdir.c */
|
||||
asmlinkage long sys_getdents64(unsigned int fd,
|
||||
@@ -1047,6 +1051,11 @@ asmlinkage long sys_pidfd_send_signal(int pidfd, int sig,
|
||||
siginfo_t __user *info,
|
||||
unsigned int flags);
|
||||
asmlinkage long sys_pidfd_getfd(int pidfd, int fd, unsigned int flags);
|
||||
asmlinkage long sys_landlock_create_ruleset(const struct landlock_ruleset_attr __user *attr,
|
||||
size_t size, __u32 flags);
|
||||
asmlinkage long sys_landlock_add_rule(int ruleset_fd, enum landlock_rule_type rule_type,
|
||||
const void __user *rule_attr, __u32 flags);
|
||||
asmlinkage long sys_landlock_restrict_self(int ruleset_fd, __u32 flags);
|
||||
|
||||
/*
|
||||
* Architecture-specific system calls
|
||||
|
||||
Reference in New Issue
Block a user