Date: Tue, 14 Feb 2023 14:47:22 GMT From: Dmitry Chagin <dchagin@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: d8e53d94fae9 - main - linux(4): Cleanup includes under compat/linux Message-ID: <202302141447.31EElMhW072508@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=d8e53d94fae90cf3c83db5af0eaba0be0f55e00a commit d8e53d94fae90cf3c83db5af0eaba0be0f55e00a Author: Dmitry Chagin <dchagin@FreeBSD.org> AuthorDate: 2023-02-14 14:46:32 +0000 Commit: Dmitry Chagin <dchagin@FreeBSD.org> CommitDate: 2023-02-14 14:46:32 +0000 linux(4): Cleanup includes under compat/linux Cleanup unneeded includes, sort the rest according to style(9). No functional changes. MFC after: 2 weeks --- sys/compat/linux/linux.c | 1 - sys/compat/linux/linux_common.c | 4 ---- sys/compat/linux/linux_dummy.c | 3 +-- sys/compat/linux/linux_emul.c | 4 +--- sys/compat/linux/linux_errno.c | 2 +- sys/compat/linux/linux_event.c | 18 +++++++----------- sys/compat/linux/linux_file.c | 7 ------- sys/compat/linux/linux_fork.c | 3 --- sys/compat/linux/linux_futex.c | 3 ++- sys/compat/linux/linux_getcwd.c | 6 ++---- sys/compat/linux/linux_ioctl.c | 22 +++++----------------- sys/compat/linux/linux_ipc.c | 7 +++---- sys/compat/linux/linux_mib.c | 8 ++------ sys/compat/linux/linux_misc.c | 10 ---------- sys/compat/linux/linux_mmap.c | 3 +-- sys/compat/linux/linux_netlink.c | 6 +++++- sys/compat/linux/linux_signal.c | 3 +-- sys/compat/linux/linux_socket.c | 12 ++---------- sys/compat/linux/linux_stats.c | 11 +++-------- sys/compat/linux/linux_sysctl.c | 5 +---- sys/compat/linux/linux_time.c | 12 ++---------- sys/compat/linux/linux_timer.c | 4 +--- sys/compat/linux/linux_uid16.c | 5 +---- sys/compat/linux/linux_util.c | 5 ----- sys/compat/linux/linux_vdso.c | 6 ++---- 25 files changed, 43 insertions(+), 127 deletions(-) diff --git a/sys/compat/linux/linux.c b/sys/compat/linux/linux.c index 3aa34a21e0c5..4e435081b3b6 100644 --- a/sys/compat/linux/linux.c +++ b/sys/compat/linux/linux.c @@ -29,7 +29,6 @@ __FBSDID("$FreeBSD$"); #include "opt_inet6.h" #include <sys/param.h> -#include <sys/systm.h> #include <sys/conf.h> #include <sys/ctype.h> #include <sys/file.h> diff --git a/sys/compat/linux/linux_common.c b/sys/compat/linux/linux_common.c index 9762f16fd747..338b1a0b6989 100644 --- a/sys/compat/linux/linux_common.c +++ b/sys/compat/linux/linux_common.c @@ -28,17 +28,13 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> -#include <sys/systm.h> #include <sys/exec.h> #include <sys/imgact.h> -#include <sys/imgact_elf.h> #include <sys/kernel.h> #include <sys/malloc.h> #include <sys/sx.h> #include <compat/linux/linux.h> -#include <compat/linux/linux_emul.h> -#include <compat/linux/linux_ioctl.h> #include <compat/linux/linux_mib.h> #include <compat/linux/linux_util.h> diff --git a/sys/compat/linux/linux_dummy.c b/sys/compat/linux/linux_dummy.c index 6bfeeaf5c298..45b0db6d6dde 100644 --- a/sys/compat/linux/linux_dummy.c +++ b/sys/compat/linux/linux_dummy.c @@ -29,9 +29,8 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> -#include <sys/kernel.h> -#include <sys/sdt.h> #include <sys/systm.h> +#include <sys/sdt.h> #include <sys/proc.h> /* diff --git a/sys/compat/linux/linux_emul.c b/sys/compat/linux/linux_emul.c index 08510fc29a3f..afe25f2cf035 100644 --- a/sys/compat/linux/linux_emul.c +++ b/sys/compat/linux/linux_emul.c @@ -32,17 +32,15 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> -#include <sys/systm.h> #include <sys/fcntl.h> #include <sys/imgact.h> -#include <sys/kernel.h> #include <sys/ktr.h> #include <sys/lock.h> #include <sys/malloc.h> #include <sys/mutex.h> -#include <sys/sx.h> #include <sys/proc.h> #include <sys/resourcevar.h> +#include <sys/sx.h> #include <sys/syscallsubr.h> #include <sys/sysent.h> diff --git a/sys/compat/linux/linux_errno.c b/sys/compat/linux/linux_errno.c index 69880db86319..a8a259fda15a 100644 --- a/sys/compat/linux/linux_errno.c +++ b/sys/compat/linux/linux_errno.c @@ -4,8 +4,8 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> -#include <sys/errno.h> #include <sys/systm.h> +#include <sys/errno.h> #include <compat/linux/linux.h> #include <compat/linux/linux_errno.h> diff --git a/sys/compat/linux/linux_event.c b/sys/compat/linux/linux_event.c index fc27996580c2..a3b54e6aac60 100644 --- a/sys/compat/linux/linux_event.c +++ b/sys/compat/linux/linux_event.c @@ -30,21 +30,17 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> -#include <sys/systm.h> -#include <sys/imgact.h> -#include <sys/kernel.h> -#include <sys/limits.h> -#include <sys/lock.h> -#include <sys/mutex.h> #include <sys/callout.h> #include <sys/capsicum.h> -#include <sys/types.h> -#include <sys/user.h> +#include <sys/errno.h> +#include <sys/event.h> +#include <sys/eventfd.h> #include <sys/file.h> #include <sys/filedesc.h> #include <sys/filio.h> -#include <sys/errno.h> -#include <sys/event.h> +#include <sys/limits.h> +#include <sys/lock.h> +#include <sys/mutex.h> #include <sys/poll.h> #include <sys/proc.h> #include <sys/selinfo.h> @@ -52,7 +48,7 @@ __FBSDID("$FreeBSD$"); #include <sys/sx.h> #include <sys/syscallsubr.h> #include <sys/timespec.h> -#include <sys/eventfd.h> +#include <sys/user.h> #ifdef COMPAT_LINUX32 #include <machine/../linux32/linux.h> diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c index 29a0afaeedda..db4b1151bc60 100644 --- a/sys/compat/linux/linux_file.c +++ b/sys/compat/linux/linux_file.c @@ -31,25 +31,18 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/systm.h> -#include <sys/capsicum.h> -#include <sys/conf.h> #include <sys/dirent.h> #include <sys/fcntl.h> #include <sys/file.h> #include <sys/filedesc.h> #include <sys/lock.h> -#include <sys/malloc.h> #include <sys/mman.h> -#include <sys/mount.h> -#include <sys/mutex.h> -#include <sys/namei.h> #include <sys/selinfo.h> #include <sys/pipe.h> #include <sys/proc.h> #include <sys/stat.h> #include <sys/sx.h> #include <sys/syscallsubr.h> -#include <sys/sysproto.h> #include <sys/tty.h> #include <sys/unistd.h> #include <sys/vnode.h> diff --git a/sys/compat/linux/linux_fork.c b/sys/compat/linux/linux_fork.c index 6918868b2c50..7e9aaff7c990 100644 --- a/sys/compat/linux/linux_fork.c +++ b/sys/compat/linux/linux_fork.c @@ -32,8 +32,6 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> -#include <sys/systm.h> -#include <sys/imgact.h> #include <sys/ktr.h> #include <sys/lock.h> #include <sys/mutex.h> @@ -45,7 +43,6 @@ __FBSDID("$FreeBSD$"); #include <sys/sx.h> #include <sys/umtxvar.h> #include <sys/unistd.h> -#include <sys/wait.h> #include <vm/vm.h> #include <vm/pmap.h> diff --git a/sys/compat/linux/linux_futex.c b/sys/compat/linux/linux_futex.c index aed6bbf94cee..af16ecfe53fe 100644 --- a/sys/compat/linux/linux_futex.c +++ b/sys/compat/linux/linux_futex.c @@ -30,15 +30,16 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> -#include <sys/systm.h> #include <sys/imgact.h> #include <sys/imgact_elf.h> #include <sys/ktr.h> +#include <sys/lock.h> #include <sys/mutex.h> #include <sys/priv.h> #include <sys/proc.h> #include <sys/sched.h> #include <sys/sysent.h> +#include <sys/vnode.h> #include <sys/umtxvar.h> #ifdef COMPAT_LINUX32 diff --git a/sys/compat/linux/linux_getcwd.c b/sys/compat/linux/linux_getcwd.c index 304a72d06588..1c893737f8a6 100644 --- a/sys/compat/linux/linux_getcwd.c +++ b/sys/compat/linux/linux_getcwd.c @@ -39,10 +39,9 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> -#include <sys/systm.h> -#include <sys/vnode.h> -#include <sys/proc.h> #include <sys/malloc.h> +#include <sys/proc.h> +#include <sys/vnode.h> #ifdef COMPAT_LINUX32 #include <machine/../linux32/linux.h> @@ -52,7 +51,6 @@ __FBSDID("$FreeBSD$"); #include <machine/../linux/linux_proto.h> #endif #include <compat/linux/linux_misc.h> -#include <compat/linux/linux_util.h> /* * Find pathname of process's current directory. diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c index 18f911de29a4..0020149c2c62 100644 --- a/sys/compat/linux/linux_ioctl.c +++ b/sys/compat/linux/linux_ioctl.c @@ -30,21 +30,12 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> -#include <sys/systm.h> -#include <sys/sysproto.h> -#ifdef COMPAT_LINUX32 -#include <sys/abi_compat.h> -#endif #include <sys/capsicum.h> #include <sys/cdio.h> -#include <sys/dvdio.h> -#include <sys/conf.h> -#include <sys/disk.h> #include <sys/consio.h> -#include <sys/ctype.h> +#include <sys/disk.h> +#include <sys/dvdio.h> #include <sys/fcntl.h> -#include <sys/file.h> -#include <sys/filedesc.h> #include <sys/filio.h> #include <sys/jail.h> #include <sys/kbio.h> @@ -53,18 +44,15 @@ __FBSDID("$FreeBSD$"); #include <sys/linker_set.h> #include <sys/lock.h> #include <sys/malloc.h> +#include <sys/mman.h> #include <sys/proc.h> #include <sys/sbuf.h> -#include <sys/socket.h> #include <sys/sockio.h> #include <sys/soundcard.h> -#include <sys/stdint.h> -#include <sys/sx.h> #include <sys/sysctl.h> +#include <sys/sysproto.h> +#include <sys/sx.h> #include <sys/tty.h> -#include <sys/types.h> -#include <sys/mman.h> -#include <sys/resourcevar.h> #include <net/if.h> #include <net/if_var.h> diff --git a/sys/compat/linux/linux_ipc.c b/sys/compat/linux/linux_ipc.c index a72b0a9709b5..0791e1ad2cbe 100644 --- a/sys/compat/linux/linux_ipc.c +++ b/sys/compat/linux/linux_ipc.c @@ -30,16 +30,15 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> -#include <sys/systm.h> -#include <sys/syscallsubr.h> -#include <sys/sysproto.h> -#include <sys/proc.h> #include <sys/limits.h> #include <sys/msg.h> +#include <sys/proc.h> #include <sys/sem.h> #include <sys/shm.h> #include <sys/stat.h> +#include <sys/syscallsubr.h> #include <sys/sysent.h> +#include <sys/sysproto.h> #ifdef COMPAT_LINUX32 #include <machine/../linux32/linux.h> diff --git a/sys/compat/linux/linux_mib.c b/sys/compat/linux/linux_mib.c index ed1bdc528278..1ff82fc79289 100644 --- a/sys/compat/linux/linux_mib.c +++ b/sys/compat/linux/linux_mib.c @@ -30,15 +30,11 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> -#include <sys/kernel.h> -#include <sys/sdt.h> -#include <sys/systm.h> -#include <sys/sysctl.h> -#include <sys/proc.h> +#include <sys/lock.h> #include <sys/malloc.h> #include <sys/mount.h> #include <sys/jail.h> -#include <sys/lock.h> +#include <sys/proc.h> #include <sys/sx.h> #include <compat/linux/linux_mib.h> diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index 562b2f3170a7..a4aa5903e3b9 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -33,16 +33,11 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> -#include <sys/blist.h> #include <sys/fcntl.h> #include <sys/jail.h> #include <sys/imgact.h> -#include <sys/kernel.h> #include <sys/limits.h> #include <sys/lock.h> -#include <sys/malloc.h> -#include <sys/mman.h> -#include <sys/mount.h> #include <sys/msgbuf.h> #include <sys/mutex.h> #include <sys/poll.h> @@ -53,20 +48,15 @@ __FBSDID("$FreeBSD$"); #include <sys/random.h> #include <sys/resourcevar.h> #include <sys/sched.h> -#include <sys/sdt.h> -#include <sys/signalvar.h> #include <sys/smp.h> #include <sys/stat.h> #include <sys/syscallsubr.h> #include <sys/sysctl.h> #include <sys/sysent.h> #include <sys/sysproto.h> -#include <sys/systm.h> #include <sys/time.h> #include <sys/vmmeter.h> #include <sys/vnode.h> -#include <sys/wait.h> -#include <sys/cpuset.h> #include <security/audit/audit.h> #include <security/mac/mac_framework.h> diff --git a/sys/compat/linux/linux_mmap.c b/sys/compat/linux/linux_mmap.c index 4e53f3255b07..07df6f5fd43d 100644 --- a/sys/compat/linux/linux_mmap.c +++ b/sys/compat/linux/linux_mmap.c @@ -34,9 +34,8 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <sys/capsicum.h> +#include <sys/fcntl.h> #include <sys/file.h> -#include <sys/imgact.h> #include <sys/ktr.h> #include <sys/lock.h> #include <sys/mman.h> diff --git a/sys/compat/linux/linux_netlink.c b/sys/compat/linux/linux_netlink.c index 7744fee094e0..8a378d596187 100644 --- a/sys/compat/linux/linux_netlink.c +++ b/sys/compat/linux/linux_netlink.c @@ -27,13 +27,17 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); + #include "opt_inet.h" #include "opt_inet6.h" + #include <sys/types.h> +#include <sys/ck.h> +#include <sys/lock.h> #include <sys/malloc.h> #include <sys/rmlock.h> #include <sys/socket.h> -#include <sys/ck.h> +#include <sys/vnode.h> #include <net/if.h> #include <net/if_dl.h> diff --git a/sys/compat/linux/linux_signal.c b/sys/compat/linux/linux_signal.c index 26da86eba9f7..4bff891d4206 100644 --- a/sys/compat/linux/linux_signal.c +++ b/sys/compat/linux/linux_signal.c @@ -32,13 +32,12 @@ __FBSDID("$FreeBSD$"); #include "opt_ktrace.h" #include <sys/param.h> -#include <sys/systm.h> #include <sys/ktr.h> #include <sys/lock.h> #include <sys/mutex.h> -#include <sys/sx.h> #include <sys/proc.h> #include <sys/signalvar.h> +#include <sys/sx.h> #include <sys/syscallsubr.h> #include <sys/sysproto.h> #ifdef KTRACE diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index d0648f88d549..ec741abe85de 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -32,23 +32,16 @@ __FBSDID("$FreeBSD$"); #include "opt_inet6.h" #include <sys/param.h> -#include <sys/proc.h> -#include <sys/systm.h> -#include <sys/sysproto.h> #include <sys/capsicum.h> -#include <sys/fcntl.h> -#include <sys/file.h> #include <sys/filedesc.h> #include <sys/limits.h> -#include <sys/lock.h> #include <sys/malloc.h> -#include <sys/mutex.h> #include <sys/mbuf.h> +#include <sys/proc.h> #include <sys/socket.h> #include <sys/socketvar.h> #include <sys/syscallsubr.h> -#include <sys/stat.h> -#include <sys/syslog.h> +#include <sys/sysproto.h> #include <sys/un.h> #include <sys/unistd.h> @@ -57,7 +50,6 @@ __FBSDID("$FreeBSD$"); #include <net/if.h> #include <net/vnet.h> #include <netinet/in.h> -#include <netinet/in_systm.h> #include <netinet/ip.h> #include <netinet/tcp.h> #ifdef INET6 diff --git a/sys/compat/linux/linux_stats.c b/sys/compat/linux/linux_stats.c index 1049cb54748b..d00888e77e84 100644 --- a/sys/compat/linux/linux_stats.c +++ b/sys/compat/linux/linux_stats.c @@ -32,19 +32,14 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/capsicum.h> #include <sys/dirent.h> -#include <sys/file.h> -#include <sys/filedesc.h> -#include <sys/proc.h> +#include <sys/lock.h> #include <sys/malloc.h> -#include <sys/mount.h> -#include <sys/namei.h> +#include <sys/mutex.h> +#include <sys/proc.h> #include <sys/stat.h> #include <sys/syscallsubr.h> -#include <sys/systm.h> #include <sys/tty.h> #include <sys/vnode.h> -#include <sys/conf.h> -#include <sys/fcntl.h> #ifdef COMPAT_LINUX32 #include <machine/../linux32/linux.h> diff --git a/sys/compat/linux/linux_sysctl.c b/sys/compat/linux/linux_sysctl.c index abf2c898902d..6c4d049821ec 100644 --- a/sys/compat/linux/linux_sysctl.c +++ b/sys/compat/linux/linux_sysctl.c @@ -30,15 +30,12 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> -#include <sys/kernel.h> #include <sys/lock.h> #include <sys/malloc.h> #include <sys/mutex.h> -#include <sys/proc.h> -#include <sys/sdt.h> #include <sys/sysctl.h> -#include <sys/systm.h> #include <sys/sbuf.h> +#include <sys/vnode.h> #ifdef COMPAT_LINUX32 #include <machine/../linux32/linux.h> diff --git a/sys/compat/linux/linux_time.c b/sys/compat/linux/linux_time.c index c35d257cd78c..102dc4fff4bd 100644 --- a/sys/compat/linux/linux_time.c +++ b/sys/compat/linux/linux_time.c @@ -38,21 +38,13 @@ __KERNEL_RCSID(0, "$NetBSD: linux_time.c,v 1.14 2006/05/14 03:40:54 christos Exp #endif #include <sys/param.h> -#include <sys/kernel.h> -#include <sys/lock.h> -#include <sys/ucred.h> #include <sys/limits.h> -#include <sys/mount.h> +#include <sys/lock.h> #include <sys/mutex.h> +#include <sys/proc.h> #include <sys/resourcevar.h> -#include <sys/sdt.h> -#include <sys/signal.h> -#include <sys/stdint.h> #include <sys/syscallsubr.h> -#include <sys/sysproto.h> #include <sys/time.h> -#include <sys/systm.h> -#include <sys/proc.h> #ifdef COMPAT_LINUX32 #include <machine/../linux32/linux.h> diff --git a/sys/compat/linux/linux_timer.c b/sys/compat/linux/linux_timer.c index 4b888eac7718..5f0f5b28e624 100644 --- a/sys/compat/linux/linux_timer.c +++ b/sys/compat/linux/linux_timer.c @@ -31,12 +31,10 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> -#include <sys/errno.h> +#include <sys/proc.h> #include <sys/signal.h> #include <sys/syscallsubr.h> -#include <sys/systm.h> #include <sys/time.h> -#include <sys/types.h> #ifdef COMPAT_LINUX32 #include <machine/../linux32/linux.h> diff --git a/sys/compat/linux/linux_uid16.c b/sys/compat/linux/linux_uid16.c index 149d75459bc8..e6ad3fb967fb 100644 --- a/sys/compat/linux/linux_uid16.c +++ b/sys/compat/linux/linux_uid16.c @@ -29,18 +29,15 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <sys/fcntl.h> #include <sys/param.h> -#include <sys/kernel.h> +#include <sys/fcntl.h> #include <sys/lock.h> #include <sys/malloc.h> #include <sys/mutex.h> #include <sys/priv.h> #include <sys/proc.h> -#include <sys/sdt.h> #include <sys/syscallsubr.h> #include <sys/sysproto.h> -#include <sys/systm.h> #ifdef COMPAT_LINUX32 #include <machine/../linux32/linux.h> diff --git a/sys/compat/linux/linux_util.c b/sys/compat/linux/linux_util.c index 2656bab92171..6d82f87a3b31 100644 --- a/sys/compat/linux/linux_util.c +++ b/sys/compat/linux/linux_util.c @@ -40,14 +40,9 @@ __FBSDID("$FreeBSD$"); #include <sys/fcntl.h> #include <sys/jail.h> #include <sys/malloc.h> -#include <sys/kernel.h> -#include <sys/linker_set.h> #include <sys/namei.h> #include <sys/proc.h> -#include <sys/sdt.h> #include <sys/syscallsubr.h> -#include <sys/sysctl.h> -#include <sys/systm.h> #include <sys/vnode.h> #include <machine/stdarg.h> diff --git a/sys/compat/linux/linux_vdso.c b/sys/compat/linux/linux_vdso.c index b4093e64eb83..af6a199f1181 100644 --- a/sys/compat/linux/linux_vdso.c +++ b/sys/compat/linux/linux_vdso.c @@ -33,22 +33,20 @@ __FBSDID("$FreeBSD$"); #endif #include <sys/param.h> -#include <sys/systm.h> #include <sys/elf.h> #include <sys/imgact.h> -#include <sys/kernel.h> +#include <sys/lock.h> #include <sys/proc.h> #include <sys/rwlock.h> -#include <sys/queue.h> #include <sys/sysent.h> -#include <vm/vm_param.h> #include <vm/pmap.h> #include <vm/vm_extern.h> #include <vm/vm_map.h> #include <vm/vm_object.h> #include <vm/vm_page.h> #include <vm/vm_pager.h> +#include <vm/vm_param.h> #include <compat/linux/linux_vdso.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202302141447.31EElMhW072508>