mirror of
https://github.com/lkl/linux.git
synced 2025-12-19 16:13:19 +09:00
Merge tag 'v5.1' into merge-5.1
Linux 5.1 Conflicts: scripts/link-vmlinux.sh tools/Makefile Signed-off-by: Hajime Tazaki <thehajime@gmail.com>
This commit is contained in:
Hajime Tazaki
@@ -54,7 +54,7 @@ struct __sysctl_args;
|
||||
struct sysinfo;
|
||||
struct timespec;
|
||||
struct timeval;
|
||||
struct timex;
|
||||
struct __kernel_timex;
|
||||
struct timezone;
|
||||
struct tms;
|
||||
struct utimbuf;
|
||||
@@ -69,6 +69,7 @@ struct file_handle;
|
||||
struct sigaltstack;
|
||||
struct rseq;
|
||||
union bpf_attr;
|
||||
struct io_uring_params;
|
||||
|
||||
#include <linux/types.h>
|
||||
#include <linux/aio_abi.h>
|
||||
@@ -303,6 +304,11 @@ asmlinkage long sys_io_getevents(aio_context_t ctx_id,
|
||||
long nr,
|
||||
struct io_event __user *events,
|
||||
struct __kernel_timespec __user *timeout);
|
||||
asmlinkage long sys_io_getevents_time32(__u32 ctx_id,
|
||||
__s32 min_nr,
|
||||
__s32 nr,
|
||||
struct io_event __user *events,
|
||||
struct old_timespec32 __user *timeout);
|
||||
asmlinkage long sys_io_pgetevents(aio_context_t ctx_id,
|
||||
long min_nr,
|
||||
long nr,
|
||||
@@ -315,6 +321,13 @@ asmlinkage long sys_io_pgetevents_time32(aio_context_t ctx_id,
|
||||
struct io_event __user *events,
|
||||
struct old_timespec32 __user *timeout,
|
||||
const struct __aio_sigset *sig);
|
||||
asmlinkage long sys_io_uring_setup(u32 entries,
|
||||
struct io_uring_params __user *p);
|
||||
asmlinkage long sys_io_uring_enter(unsigned int fd, u32 to_submit,
|
||||
u32 min_complete, u32 flags,
|
||||
const sigset_t __user *sig, size_t sigsz);
|
||||
asmlinkage long sys_io_uring_register(unsigned int fd, unsigned int op,
|
||||
void __user *arg, unsigned int nr_args);
|
||||
|
||||
/* fs/xattr.c */
|
||||
asmlinkage long sys_setxattr(const char __user *path, const char __user *name,
|
||||
@@ -528,11 +541,19 @@ asmlinkage long sys_timerfd_settime(int ufd, int flags,
|
||||
const struct __kernel_itimerspec __user *utmr,
|
||||
struct __kernel_itimerspec __user *otmr);
|
||||
asmlinkage long sys_timerfd_gettime(int ufd, struct __kernel_itimerspec __user *otmr);
|
||||
asmlinkage long sys_timerfd_gettime32(int ufd,
|
||||
struct old_itimerspec32 __user *otmr);
|
||||
asmlinkage long sys_timerfd_settime32(int ufd, int flags,
|
||||
const struct old_itimerspec32 __user *utmr,
|
||||
struct old_itimerspec32 __user *otmr);
|
||||
|
||||
/* fs/utimes.c */
|
||||
asmlinkage long sys_utimensat(int dfd, const char __user *filename,
|
||||
struct __kernel_timespec __user *utimes,
|
||||
int flags);
|
||||
asmlinkage long sys_utimensat_time32(unsigned int dfd,
|
||||
const char __user *filename,
|
||||
struct old_timespec32 __user *t, int flags);
|
||||
|
||||
/* kernel/acct.c */
|
||||
asmlinkage long sys_acct(const char __user *name);
|
||||
@@ -561,6 +582,9 @@ asmlinkage long sys_unshare(unsigned long unshare_flags);
|
||||
asmlinkage long sys_futex(u32 __user *uaddr, int op, u32 val,
|
||||
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);
|
||||
asmlinkage long sys_get_robust_list(int pid,
|
||||
struct robust_list_head __user * __user *head_ptr,
|
||||
size_t __user *len_ptr);
|
||||
@@ -570,6 +594,8 @@ asmlinkage long sys_set_robust_list(struct robust_list_head __user *head,
|
||||
/* kernel/hrtimer.c */
|
||||
asmlinkage long sys_nanosleep(struct __kernel_timespec __user *rqtp,
|
||||
struct __kernel_timespec __user *rmtp);
|
||||
asmlinkage long sys_nanosleep_time32(struct old_timespec32 __user *rqtp,
|
||||
struct old_timespec32 __user *rmtp);
|
||||
|
||||
/* kernel/itimer.c */
|
||||
asmlinkage long sys_getitimer(int which, struct itimerval __user *value);
|
||||
@@ -597,7 +623,7 @@ asmlinkage long sys_timer_gettime(timer_t timer_id,
|
||||
asmlinkage long sys_timer_getoverrun(timer_t timer_id);
|
||||
asmlinkage long sys_timer_settime(timer_t timer_id, int flags,
|
||||
const struct __kernel_itimerspec __user *new_setting,
|
||||
struct itimerspec __user *old_setting);
|
||||
struct __kernel_itimerspec __user *old_setting);
|
||||
asmlinkage long sys_timer_delete(timer_t timer_id);
|
||||
asmlinkage long sys_clock_settime(clockid_t which_clock,
|
||||
const struct __kernel_timespec __user *tp);
|
||||
@@ -608,6 +634,20 @@ asmlinkage long sys_clock_getres(clockid_t which_clock,
|
||||
asmlinkage long sys_clock_nanosleep(clockid_t which_clock, int flags,
|
||||
const struct __kernel_timespec __user *rqtp,
|
||||
struct __kernel_timespec __user *rmtp);
|
||||
asmlinkage long sys_timer_gettime32(timer_t timer_id,
|
||||
struct old_itimerspec32 __user *setting);
|
||||
asmlinkage long sys_timer_settime32(timer_t timer_id, int flags,
|
||||
struct old_itimerspec32 __user *new,
|
||||
struct old_itimerspec32 __user *old);
|
||||
asmlinkage long sys_clock_settime32(clockid_t which_clock,
|
||||
struct old_timespec32 __user *tp);
|
||||
asmlinkage long sys_clock_gettime32(clockid_t which_clock,
|
||||
struct old_timespec32 __user *tp);
|
||||
asmlinkage long sys_clock_getres_time32(clockid_t which_clock,
|
||||
struct old_timespec32 __user *tp);
|
||||
asmlinkage long sys_clock_nanosleep_time32(clockid_t which_clock, int flags,
|
||||
struct old_timespec32 __user *rqtp,
|
||||
struct old_timespec32 __user *rmtp);
|
||||
|
||||
/* kernel/printk.c */
|
||||
asmlinkage long sys_syslog(int type, char __user *buf, int len);
|
||||
@@ -633,6 +673,8 @@ asmlinkage long sys_sched_get_priority_max(int policy);
|
||||
asmlinkage long sys_sched_get_priority_min(int policy);
|
||||
asmlinkage long sys_sched_rr_get_interval(pid_t pid,
|
||||
struct __kernel_timespec __user *interval);
|
||||
asmlinkage long sys_sched_rr_get_interval_time32(pid_t pid,
|
||||
struct old_timespec32 __user *interval);
|
||||
|
||||
/* kernel/signal.c */
|
||||
asmlinkage long sys_restart_syscall(void);
|
||||
@@ -701,7 +743,8 @@ asmlinkage long sys_gettimeofday(struct timeval __user *tv,
|
||||
struct timezone __user *tz);
|
||||
asmlinkage long sys_settimeofday(struct timeval __user *tv,
|
||||
struct timezone __user *tz);
|
||||
asmlinkage long sys_adjtimex(struct timex __user *txc_p);
|
||||
asmlinkage long sys_adjtimex(struct __kernel_timex __user *txc_p);
|
||||
asmlinkage long sys_adjtimex_time32(struct old_timex32 __user *txc_p);
|
||||
|
||||
/* kernel/timer.c */
|
||||
asmlinkage long sys_getpid(void);
|
||||
@@ -720,9 +763,18 @@ asmlinkage long sys_mq_timedsend(mqd_t mqdes, const char __user *msg_ptr, size_t
|
||||
asmlinkage long sys_mq_timedreceive(mqd_t mqdes, char __user *msg_ptr, size_t msg_len, unsigned int __user *msg_prio, const struct __kernel_timespec __user *abs_timeout);
|
||||
asmlinkage long sys_mq_notify(mqd_t mqdes, const struct sigevent __user *notification);
|
||||
asmlinkage long sys_mq_getsetattr(mqd_t mqdes, const struct mq_attr __user *mqstat, struct mq_attr __user *omqstat);
|
||||
asmlinkage long sys_mq_timedreceive_time32(mqd_t mqdes,
|
||||
char __user *u_msg_ptr,
|
||||
unsigned int msg_len, unsigned int __user *u_msg_prio,
|
||||
const struct old_timespec32 __user *u_abs_timeout);
|
||||
asmlinkage long sys_mq_timedsend_time32(mqd_t mqdes,
|
||||
const char __user *u_msg_ptr,
|
||||
unsigned int msg_len, unsigned int msg_prio,
|
||||
const struct old_timespec32 __user *u_abs_timeout);
|
||||
|
||||
/* ipc/msg.c */
|
||||
asmlinkage long sys_msgget(key_t key, int msgflg);
|
||||
asmlinkage long sys_old_msgctl(int msqid, int cmd, struct msqid_ds __user *buf);
|
||||
asmlinkage long sys_msgctl(int msqid, int cmd, struct msqid_ds __user *buf);
|
||||
asmlinkage long sys_msgrcv(int msqid, struct msgbuf __user *msgp,
|
||||
size_t msgsz, long msgtyp, int msgflg);
|
||||
@@ -732,14 +784,19 @@ asmlinkage long sys_msgsnd(int msqid, struct msgbuf __user *msgp,
|
||||
/* ipc/sem.c */
|
||||
asmlinkage long sys_semget(key_t key, int nsems, int semflg);
|
||||
asmlinkage long sys_semctl(int semid, int semnum, int cmd, unsigned long arg);
|
||||
asmlinkage long sys_old_semctl(int semid, int semnum, int cmd, unsigned long arg);
|
||||
asmlinkage long sys_semtimedop(int semid, struct sembuf __user *sops,
|
||||
unsigned nsops,
|
||||
const struct __kernel_timespec __user *timeout);
|
||||
asmlinkage long sys_semtimedop_time32(int semid, struct sembuf __user *sops,
|
||||
unsigned nsops,
|
||||
const struct old_timespec32 __user *timeout);
|
||||
asmlinkage long sys_semop(int semid, struct sembuf __user *sops,
|
||||
unsigned nsops);
|
||||
|
||||
/* ipc/shm.c */
|
||||
asmlinkage long sys_shmget(key_t key, size_t size, int flag);
|
||||
asmlinkage long sys_old_shmctl(int shmid, int cmd, struct shmid_ds __user *buf);
|
||||
asmlinkage long sys_shmctl(int shmid, int cmd, struct shmid_ds __user *buf);
|
||||
asmlinkage long sys_shmat(int shmid, char __user *shmaddr, int shmflg);
|
||||
asmlinkage long sys_shmdt(char __user *shmaddr);
|
||||
@@ -873,7 +930,9 @@ asmlinkage long sys_open_by_handle_at(int mountdirfd,
|
||||
struct file_handle __user *handle,
|
||||
int flags);
|
||||
asmlinkage long sys_clock_adjtime(clockid_t which_clock,
|
||||
struct timex __user *tx);
|
||||
struct __kernel_timex __user *tx);
|
||||
asmlinkage long sys_clock_adjtime32(clockid_t which_clock,
|
||||
struct old_timex32 __user *tx);
|
||||
asmlinkage long sys_syncfs(int fd);
|
||||
asmlinkage long sys_setns(int fd, int nstype);
|
||||
asmlinkage long sys_sendmmsg(int fd, struct mmsghdr __user *msg,
|
||||
@@ -932,6 +991,9 @@ asmlinkage long sys_statx(int dfd, const char __user *path, unsigned flags,
|
||||
unsigned mask, struct statx __user *buffer);
|
||||
asmlinkage long sys_rseq(struct rseq __user *rseq, uint32_t rseq_len,
|
||||
int flags, uint32_t sig);
|
||||
asmlinkage long sys_pidfd_send_signal(int pidfd, int sig,
|
||||
siginfo_t __user *info,
|
||||
unsigned int flags);
|
||||
|
||||
/*
|
||||
* Architecture-specific system calls
|
||||
@@ -1009,6 +1071,7 @@ asmlinkage long sys_alarm(unsigned int seconds);
|
||||
asmlinkage long sys_getpgrp(void);
|
||||
asmlinkage long sys_pause(void);
|
||||
asmlinkage long sys_time(time_t __user *tloc);
|
||||
asmlinkage long sys_time32(old_time32_t __user *tloc);
|
||||
#ifdef __ARCH_WANT_SYS_UTIME
|
||||
asmlinkage long sys_utime(char __user *filename,
|
||||
struct utimbuf __user *times);
|
||||
@@ -1017,6 +1080,13 @@ asmlinkage long sys_utimes(char __user *filename,
|
||||
asmlinkage long sys_futimesat(int dfd, const char __user *filename,
|
||||
struct timeval __user *utimes);
|
||||
#endif
|
||||
asmlinkage long sys_futimesat_time32(unsigned int dfd,
|
||||
const char __user *filename,
|
||||
struct old_timeval32 __user *t);
|
||||
asmlinkage long sys_utime32(const char __user *filename,
|
||||
struct old_utimbuf32 __user *t);
|
||||
asmlinkage long sys_utimes_time32(const char __user *filename,
|
||||
struct old_timeval32 __user *t);
|
||||
asmlinkage long sys_creat(const char __user *pathname, umode_t mode);
|
||||
asmlinkage long sys_getdents(unsigned int fd,
|
||||
struct linux_dirent __user *dirent,
|
||||
@@ -1041,6 +1111,7 @@ asmlinkage long sys_fork(void);
|
||||
|
||||
/* obsolete: kernel/time/time.c */
|
||||
asmlinkage long sys_stime(time_t __user *tptr);
|
||||
asmlinkage long sys_stime32(old_time32_t __user *tptr);
|
||||
|
||||
/* obsolete: kernel/signal.c */
|
||||
asmlinkage long sys_sigpending(old_sigset_t __user *uset);
|
||||
@@ -1191,6 +1262,10 @@ unsigned long ksys_mmap_pgoff(unsigned long addr, unsigned long len,
|
||||
unsigned long prot, unsigned long flags,
|
||||
unsigned long fd, unsigned long pgoff);
|
||||
ssize_t ksys_readahead(int fd, loff_t offset, size_t count);
|
||||
int ksys_ipc(unsigned int call, int first, unsigned long second,
|
||||
unsigned long third, void __user * ptr, long fifth);
|
||||
int compat_ksys_ipc(u32 call, int first, int second,
|
||||
u32 third, u32 ptr, u32 fifth);
|
||||
|
||||
/*
|
||||
* The following kernel syscall equivalents are just wrappers to fs-internal
|
||||
|
||||
Reference in New Issue
Block a user