From d8e53d94fae90cf3c83db5af0eaba0be0f55e00a Mon Sep 17 00:00:00 2001 From: Dmitry Chagin Date: Tue, 14 Feb 2023 17:46:32 +0300 Subject: 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(-) (limited to 'sys') 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 -#include #include #include #include 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 -#include #include #include -#include #include #include #include #include -#include -#include #include #include 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 -#include -#include #include +#include #include /* 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 -#include #include #include -#include #include #include #include #include -#include #include #include +#include #include #include 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 -#include #include +#include #include #include 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 -#include -#include -#include -#include -#include -#include #include #include -#include -#include +#include +#include +#include #include #include #include -#include -#include +#include +#include +#include #include #include #include @@ -52,7 +48,7 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include +#include #ifdef COMPAT_LINUX32 #include 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 #include -#include -#include #include #include #include #include #include -#include #include -#include -#include -#include #include #include #include #include #include #include -#include #include #include #include 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 -#include -#include #include #include #include @@ -45,7 +43,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include 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 -#include #include #include #include +#include #include #include #include #include #include +#include #include #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 -#include -#include -#include #include +#include +#include #ifdef COMPAT_LINUX32 #include @@ -52,7 +51,6 @@ __FBSDID("$FreeBSD$"); #include #endif #include -#include /* * 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 -#include -#include -#ifdef COMPAT_LINUX32 -#include -#endif #include #include -#include -#include -#include #include -#include +#include +#include #include -#include -#include #include #include #include @@ -53,18 +44,15 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include -#include #include #include -#include -#include #include +#include +#include #include -#include -#include -#include #include #include 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 -#include -#include -#include -#include #include #include +#include #include #include #include +#include #include +#include #ifdef COMPAT_LINUX32 #include 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 -#include -#include -#include -#include -#include +#include #include #include #include -#include +#include #include #include 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 -#include #include #include #include -#include #include #include -#include -#include -#include #include #include #include @@ -53,20 +48,15 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include -#include #include #include #include #include #include #include -#include #include #include #include -#include -#include #include #include 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 __FBSDID("$FreeBSD$"); -#include +#include #include -#include #include #include #include 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 __FBSDID("$FreeBSD$"); + #include "opt_inet.h" #include "opt_inet6.h" + #include +#include +#include #include #include #include -#include +#include #include #include 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 -#include #include #include #include -#include #include #include +#include #include #include #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 -#include -#include -#include #include -#include -#include #include #include -#include #include -#include #include +#include #include #include #include -#include -#include +#include #include #include @@ -57,7 +50,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #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 #include #include -#include -#include -#include +#include #include -#include -#include +#include +#include #include #include -#include #include #include -#include -#include #ifdef COMPAT_LINUX32 #include 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 -#include #include #include #include -#include -#include #include -#include #include +#include #ifdef COMPAT_LINUX32 #include 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 -#include -#include -#include #include -#include +#include #include +#include #include -#include -#include -#include #include -#include #include -#include -#include #ifdef COMPAT_LINUX32 #include 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 -#include +#include #include #include -#include #include -#include #ifdef COMPAT_LINUX32 #include 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 __FBSDID("$FreeBSD$"); -#include #include -#include +#include #include #include #include #include #include -#include #include #include -#include #ifdef COMPAT_LINUX32 #include 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 #include #include -#include -#include #include #include -#include #include -#include -#include #include #include 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 -#include #include #include -#include +#include #include #include -#include #include -#include #include #include #include #include #include #include +#include #include -- cgit v1.2.3