mirror of
https://github.com/lkl/linux.git
synced 2025-12-19 08:03:01 +09:00
Merge tag 'v5.12' into merge-5.18-t3
Linux 5.12 Conflicts: tools/Makefile Signed-off-by: Hajime Tazaki <thehajime@gmail.com>
This commit is contained in:
@@ -68,6 +68,7 @@ union bpf_attr;
|
||||
struct io_uring_params;
|
||||
struct clone_args;
|
||||
struct open_how;
|
||||
struct mount_attr;
|
||||
|
||||
#include <linux/types.h>
|
||||
#include <linux/aio_abi.h>
|
||||
@@ -613,11 +614,11 @@ asmlinkage long sys_unshare(unsigned long unshare_flags);
|
||||
|
||||
/* kernel/futex.c */
|
||||
asmlinkage long sys_futex(u32 __user *uaddr, int op, u32 val,
|
||||
struct __kernel_timespec __user *utime, u32 __user *uaddr2,
|
||||
u32 val3);
|
||||
const struct __kernel_timespec __user *utime,
|
||||
u32 __user *uaddr2, u32 val3);
|
||||
asmlinkage long sys_futex_time32(u32 __user *uaddr, int op, u32 val,
|
||||
struct old_timespec32 __user *utime, u32 __user *uaddr2,
|
||||
u32 val3);
|
||||
const struct old_timespec32 __user *utime,
|
||||
u32 __user *uaddr2, u32 val3);
|
||||
asmlinkage long sys_get_robust_list(int pid,
|
||||
struct robust_list_head __user * __user *head_ptr,
|
||||
size_t __user *len_ptr);
|
||||
@@ -1034,6 +1035,9 @@ asmlinkage long sys_open_tree(int dfd, const char __user *path, unsigned flags);
|
||||
asmlinkage long sys_move_mount(int from_dfd, const char __user *from_path,
|
||||
int to_dfd, const char __user *to_path,
|
||||
unsigned int ms_flags);
|
||||
asmlinkage long sys_mount_setattr(int dfd, const char __user *path,
|
||||
unsigned int flags,
|
||||
struct mount_attr __user *uattr, size_t usize);
|
||||
asmlinkage long sys_fsopen(const char __user *fs_name, unsigned int flags);
|
||||
asmlinkage long sys_fsconfig(int fs_fd, unsigned int cmd, const char __user *key,
|
||||
const void __user *value, int aux);
|
||||
|
||||
Reference in New Issue
Block a user