The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=a31127e6dfbfd96e512e0a238f4359c90849e3fb
commit a31127e6dfbfd96e512e0a238f4359c90849e3fb Author: Brooks Davis <[email protected]> AuthorDate: 2026-02-19 15:06:29 +0000 Commit: Brooks Davis <[email protected]> CommitDate: 2026-02-19 15:10:33 +0000 sys/syscallsubr.h: assorted tidying - gc unused struct kevent - sort kern_frmdirat, kern_funlinkat, kern_kexec_load, and kern_kqueue - put user_ functions in their own section Effort: CHERI upstreaming Reviewed by: kib Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D55309 --- sys/sys/syscallsubr.h | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/sys/sys/syscallsubr.h b/sys/sys/syscallsubr.h index 35e2b771cbe7..a714ecf9412b 100644 --- a/sys/sys/syscallsubr.h +++ b/sys/sys/syscallsubr.h @@ -45,7 +45,6 @@ enum idtype; struct itimerval; struct image_args; struct jail; -struct kevent; struct kevent_copyops; struct kexec_segment; struct kld_file_stat; @@ -120,16 +119,10 @@ int kern_connectat(struct thread *td, int dirfd, int fd, struct sockaddr *sa); int kern_copy_file_range(struct thread *td, int infd, off_t *inoffp, int outfd, off_t *outoffp, size_t len, unsigned int flags); -int user_cpuset_getaffinity(struct thread *td, cpulevel_t level, - cpuwhich_t which, id_t id, size_t cpusetsize, cpuset_t *maskp, - const struct cpuset_copy_cb *cb); int kern_cpuset_getaffinity(struct thread *td, cpulevel_t level, cpuwhich_t which, id_t id, size_t cpusetsize, cpuset_t *mask); int kern_cpuset_setaffinity(struct thread *td, cpulevel_t level, cpuwhich_t which, id_t id, cpuset_t *maskp); -int user_cpuset_setaffinity(struct thread *td, cpulevel_t level, - cpuwhich_t which, id_t id, size_t cpusetsize, - const cpuset_t *maskp, const struct cpuset_copy_cb *cb); int kern_cpuset_getdomain(struct thread *td, cpulevel_t level, cpuwhich_t which, id_t id, size_t domainsetsize, domainset_t *maskp, int *policyp, const struct cpuset_copy_cb *cb); @@ -175,10 +168,14 @@ int kern_fhstatfs(struct thread *td, fhandle_t fh, struct statfs *buf); int kern_fpathconf(struct thread *td, int fd, int name, long *valuep); int kern_freebsd11_getfsstat(struct thread *td, struct freebsd11_statfs *ubuf, long bufsize, int mode); +int kern_frmdirat(struct thread *td, int dfd, const char *path, int fd, + enum uio_seg pathseg, int flag); int kern_fstat(struct thread *td, int fd, struct stat *sbp); int kern_fstatfs(struct thread *td, int fd, struct statfs *buf); int kern_fsync(struct thread *td, int fd, bool fullsync); int kern_ftruncate(struct thread *td, int fd, off_t length); +int kern_funlinkat(struct thread *td, int dfd, const char *path, int fd, + enum uio_seg pathseg, int flag, ino_t oldinum); int kern_futimes(struct thread *td, int fd, const struct timeval *tptr, enum uio_seg tptrseg); int kern_futimens(struct thread *td, int fd, const struct timespec *tptr, @@ -211,9 +208,9 @@ int kern_kevent_anonymous(struct thread *td, int nevents, int kern_kevent_fp(struct thread *td, struct file *fp, int nchanges, int nevents, struct kevent_copyops *k_ops, const struct timespec *timeout); +int kern_kexec_load(struct thread *td, u_long entry, + u_long nseg, struct kexec_segment *seg, u_long flags); int kern_kill(struct thread *td, pid_t pid, int signum); -int kern_kqueue(struct thread *td, int flags, bool cponfork, - struct filecaps *fcaps); int kern_kldload(struct thread *td, const char *file, int *fileid); int kern_kldstat(struct thread *td, int fileid, struct kld_file_stat *stat); int kern_kldunload(struct thread *td, int fileid, int flags); @@ -226,6 +223,8 @@ int kern_kmq_timedreceive(struct thread *, int, char *, size_t, unsigned int *, const struct timespec *); int kern_kmq_timedsend(struct thread *td, int, const char *, size_t, unsigned int, const struct timespec *); +int kern_kqueue(struct thread *td, int flags, bool cponfork, + struct filecaps *fcaps); int kern_linkat(struct thread *td, int fd1, int fd2, const char *path1, const char *path2, enum uio_seg segflg, int flag); int kern_listen(struct thread *td, int s, int backlog); @@ -307,8 +306,6 @@ int kern_recvit(struct thread *td, int s, struct msghdr *mp, enum uio_seg fromseg, struct mbuf **controlp); int kern_renameat(struct thread *td, int oldfd, const char *old, int newfd, const char *new, enum uio_seg pathseg); -int kern_frmdirat(struct thread *td, int dfd, const char *path, int fd, - enum uio_seg pathseg, int flag); int kern_sched_getparam(struct thread *td, struct thread *targettd, struct sched_param *param); int kern_sched_getscheduler(struct thread *td, struct thread *targettd, @@ -388,8 +385,6 @@ int kern_timerfd_settime(struct thread *td, int fd, int flags, const struct itimerspec *new_value, struct itimerspec *old_value); int kern_truncate(struct thread *td, const char *path, enum uio_seg pathseg, off_t length); -int kern_funlinkat(struct thread *td, int dfd, const char *path, int fd, - enum uio_seg pathseg, int flag, ino_t oldinum); int kern_utimesat(struct thread *td, int fd, const char *path, enum uio_seg pathseg, const struct timeval *tptr, enum uio_seg tptrseg); @@ -404,8 +399,13 @@ int kern_writev(struct thread *td, int fd, struct uio *auio); int kern_socketpair(struct thread *td, int domain, int type, int protocol, int *rsv); int kern_unmount(struct thread *td, const char *path, uint64_t flags); -int kern_kexec_load(struct thread *td, u_long entry, - u_long nseg, struct kexec_segment *seg, u_long flags); + +int user_cpuset_getaffinity(struct thread *td, cpulevel_t level, + cpuwhich_t which, id_t id, size_t cpusetsize, cpuset_t *maskp, + const struct cpuset_copy_cb *cb); +int user_cpuset_setaffinity(struct thread *td, cpulevel_t level, + cpuwhich_t which, id_t id, size_t cpusetsize, + const cpuset_t *maskp, const struct cpuset_copy_cb *cb); /* flags for kern_sigaction */ #define KSA_OSIGSET 0x0001 /* uses osigact_t */
