Date: Tue, 14 Feb 2023 14:47:23 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: f4a512a5f187 - main - linux(4): Cleanup includes under i386/linux Message-ID: <202302141447.31EElNiB072538@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=f4a512a5f187d9139c04111784fe811572bc0ed6 commit f4a512a5f187d9139c04111784fe811572bc0ed6 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 i386/linux Cleanup unneeded includes, sort the rest according to style(9). No functional changes. MFC after: 2 weeks --- sys/i386/linux/linux_copyout.c | 2 +- sys/i386/linux/linux_dummy_machdep.c | 3 +-- sys/i386/linux/linux_machdep.c | 17 ++++------------- sys/i386/linux/linux_sysvec.c | 10 +++------- 4 files changed, 9 insertions(+), 23 deletions(-) diff --git a/sys/i386/linux/linux_copyout.c b/sys/i386/linux/linux_copyout.c index 3227d904a235..833d25b911c9 100644 --- a/sys/i386/linux/linux_copyout.c +++ b/sys/i386/linux/linux_copyout.c @@ -32,10 +32,10 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> -#include <sys/systm.h> #include <sys/imgact.h> #include <sys/lock.h> #include <sys/sx.h> + #include <vm/vm.h> #include <vm/vm_param.h> #include <vm/vm_extern.h> diff --git a/sys/i386/linux/linux_dummy_machdep.c b/sys/i386/linux/linux_dummy_machdep.c index 0e41a4b3fc56..7f29d2a6808c 100644 --- a/sys/i386/linux/linux_dummy_machdep.c +++ b/sys/i386/linux/linux_dummy_machdep.c @@ -31,9 +31,8 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/kernel.h> -#include <sys/sdt.h> -#include <sys/systm.h> #include <sys/proc.h> +#include <sys/sdt.h> #include <i386/linux/linux.h> #include <i386/linux/linux_proto.h> diff --git a/sys/i386/linux/linux_machdep.c b/sys/i386/linux/linux_machdep.c index 148258ac049c..0d06218ddc62 100644 --- a/sys/i386/linux/linux_machdep.c +++ b/sys/i386/linux/linux_machdep.c @@ -29,11 +29,11 @@ #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); +#include "opt_posix.h" + #include <sys/param.h> -#include <sys/capsicum.h> #include <sys/imgact_aout.h> #include <sys/fcntl.h> -#include <sys/file.h> #include <sys/lock.h> #include <sys/malloc.h> #include <sys/mman.h> @@ -41,32 +41,26 @@ __FBSDID("$FreeBSD$"); #include <sys/namei.h> #include <sys/priv.h> #include <sys/proc.h> -#include <sys/queue.h> #include <sys/racct.h> #include <sys/resource.h> #include <sys/resourcevar.h> -#include <sys/sched.h> -#include <sys/signalvar.h> #include <sys/syscallsubr.h> #include <sys/sysproto.h> -#include <sys/systm.h> -#include <sys/sx.h> -#include <sys/unistd.h> #include <sys/vnode.h> -#include <sys/wait.h> #include <security/audit/audit.h> #include <security/mac/mac_framework.h> #include <machine/frame.h> +#include <machine/pcb.h> /* needed for pcb definition in linux_set_thread_area */ #include <machine/psl.h> #include <machine/segments.h> #include <machine/sysarch.h> #include <vm/pmap.h> #include <vm/vm.h> -#include <vm/vm_kern.h> #include <vm/vm_extern.h> +#include <vm/vm_kern.h> #include <vm/vm_map.h> #include <vm/vm_param.h> @@ -82,9 +76,6 @@ __FBSDID("$FreeBSD$"); #include <compat/linux/linux_signal.h> #include <compat/linux/linux_util.h> -#include <i386/include/pcb.h> /* needed for pcb definition in linux_set_thread_area */ - -#include "opt_posix.h" struct l_descriptor { l_uint entry_number; diff --git a/sys/i386/linux/linux_sysvec.c b/sys/i386/linux/linux_sysvec.c index b16e32ac62f1..f0b979725741 100644 --- a/sys/i386/linux/linux_sysvec.c +++ b/sys/i386/linux/linux_sysvec.c @@ -32,31 +32,27 @@ __FBSDID("$FreeBSD$"); #define __ELF_WORD_SIZE 32 #include <sys/param.h> -#include <sys/systm.h> #include <sys/exec.h> #include <sys/fcntl.h> #include <sys/imgact.h> #include <sys/imgact_aout.h> #include <sys/imgact_elf.h> #include <sys/kernel.h> +#include <sys/lock.h> #include <sys/malloc.h> #include <sys/module.h> +#include <sys/mutex.h> #include <sys/proc.h> #include <sys/stddef.h> -#include <sys/signalvar.h> #include <sys/syscallsubr.h> #include <sys/sysctl.h> #include <sys/sysent.h> #include <sys/sysproto.h> -#include <sys/vnode.h> -#include <vm/vm.h> #include <vm/pmap.h> -#include <vm/vm_extern.h> +#include <vm/vm.h> #include <vm/vm_map.h> -#include <vm/vm_object.h> #include <vm/vm_page.h> -#include <vm/vm_param.h> #include <machine/cpu.h> #include <machine/cputypes.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202302141447.31EElNiB072538>