src - FreeBSD source tree

diff options


context:
space:
mode:

author	Dmitry Chagin <dchagin@FreeBSD.org>	2023-02-14 14:46:32 +0000
committer	Dmitry Chagin <dchagin@FreeBSD.org>	2023-03-01 08:42:35 +0000
commit	bfda8d0651eddd4d22cc0b53419c20a3ae55596e (patch)
tree	37892d3f1df96b0a8d85e41448d79ee7f27f28b9
parent	2caa52c46ca1dc337949fc30f24db7ae49c53e45 (diff)
download	src-bfda8d0651eddd4d22cc0b53419c20a3ae55596e.tar.gz src-bfda8d0651eddd4d22cc0b53419c20a3ae55596e.zip

linux(4): Cleanup includes under amd64/linux

Cleanup unneeded includes, sort the rest according to style(9). No functional changes. MFC after: 2 weeks (cherry picked from commit 2456a45929328ce73a40ef6577600b0f1e2cced6)

Diffstat

-rw-r--r--

sys/amd64/linux/linux_dummy_machdep.c

-rw-r--r--

sys/amd64/linux/linux_genassym.c

-rw-r--r--

sys/amd64/linux/linux_machdep.c

-rw-r--r--

sys/amd64/linux/linux_sysvec.c

-rw-r--r--

sys/amd64/linux32/linux32_dummy_machdep.c

-rw-r--r--

sys/amd64/linux32/linux32_genassym.c

-rw-r--r--

sys/amd64/linux32/linux32_machdep.c

-rw-r--r--

sys/amd64/linux32/linux32_sysvec.c

8 files changed, 7 insertions, 58 deletions

diff --git a/sys/amd64/linux/linux_dummy_machdep.c b/sys/amd64/linux/linux_dummy_machdep.c
index 3ce407af291c..ed148a5a6500 100644
--- a/sys/amd64/linux/linux_dummy_machdep.c
+++ b/sys/amd64/linux/linux_dummy_machdep.c

@@ -30,9 +30,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 <amd64/linux/linux.h>

#include <amd64/linux/linux_proto.h>

diff --git a/sys/amd64/linux/linux_genassym.c b/sys/amd64/linux/linux_genassym.c
index 14880afcc89b..70e1ae91eab9 100644
--- a/sys/amd64/linux/linux_genassym.c
+++ b/sys/amd64/linux/linux_genassym.c

@@ -2,8 +2,8 @@

__FBSDID("$FreeBSD$");

#include <sys/param.h>

-#include <sys/assym.h>

#include <sys/systm.h>

+#include <sys/assym.h>

#include <amd64/linux/linux.h>

#include <compat/linux/linux_mib.h>

diff --git a/sys/amd64/linux/linux_machdep.c b/sys/amd64/linux/linux_machdep.c
index ed905518fdf4..6c96dd496fdc 100644
--- a/sys/amd64/linux/linux_machdep.c
+++ b/sys/amd64/linux/linux_machdep.c

@@ -33,15 +33,8 @@

__FBSDID("$FreeBSD$");

#include <sys/param.h>

-#include <sys/capsicum.h>

-#include <sys/clock.h>

-#include <sys/dirent.h>

-#include <sys/fcntl.h>

-#include <sys/file.h>

-#include <sys/filedesc.h>

-#include <sys/kernel.h>

+#include <sys/systm.h>

#include <sys/ktr.h>

-#include <sys/limits.h>

#include <sys/lock.h>

#include <sys/malloc.h>

#include <sys/mman.h>

@@ -49,15 +42,7 @@ __FBSDID("$FreeBSD$");

#include <sys/priv.h>

#include <sys/proc.h>

#include <sys/ptrace.h>

-#include <sys/resource.h>

-#include <sys/resourcevar.h>

-#include <sys/sched.h>

#include <sys/syscallsubr.h>

-#include <sys/sysproto.h>

-#include <sys/systm.h>

-#include <sys/unistd.h>

-#include <sys/vnode.h>

-#include <sys/wait.h>

#include <security/mac/mac_framework.h>

@@ -85,13 +70,9 @@ __FBSDID("$FreeBSD$");

#include <amd64/linux/linux.h>

#include <amd64/linux/linux_proto.h>

-#include <compat/linux/linux_emul.h>

-#include <compat/linux/linux_file.h>

#include <compat/linux/linux_fork.h>

-#include <compat/linux/linux_ipc.h>

#include <compat/linux/linux_misc.h>

#include <compat/linux/linux_mmap.h>

-#include <compat/linux/linux_signal.h>

#include <compat/linux/linux_util.h>

#define LINUX_ARCH_AMD64 0xc000003e

diff --git a/sys/amd64/linux/linux_sysvec.c b/sys/amd64/linux/linux_sysvec.c
index 05dd618fa510..2ad1868db8d4 100644
--- a/sys/amd64/linux/linux_sysvec.c
+++ b/sys/amd64/linux/linux_sysvec.c

@@ -37,9 +37,7 @@ __FBSDID("$FreeBSD$");

#define __ELF_WORD_SIZE 64

#include <sys/param.h>

-#include <sys/systm.h>

#include <sys/exec.h>

-#include <sys/fcntl.h>

#include <sys/imgact.h>

#include <sys/imgact_elf.h>

#include <sys/kernel.h>

@@ -49,23 +47,15 @@ __FBSDID("$FreeBSD$");

#include <sys/module.h>

#include <sys/mutex.h>

#include <sys/proc.h>

-#include <sys/resourcevar.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 <sys/eventhandler.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/md_var.h>

diff --git a/sys/amd64/linux32/linux32_dummy_machdep.c b/sys/amd64/linux32/linux32_dummy_machdep.c
index f3bd8717524a..bc7a3c0aa69b 100644
--- a/sys/amd64/linux32/linux32_dummy_machdep.c
+++ b/sys/amd64/linux32/linux32_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 <amd64/linux32/linux.h>

#include <amd64/linux32/linux32_proto.h>

diff --git a/sys/amd64/linux32/linux32_genassym.c b/sys/amd64/linux32/linux32_genassym.c
index 4a87b5a423bc..323634b3001d 100644
--- a/sys/amd64/linux32/linux32_genassym.c
+++ b/sys/amd64/linux32/linux32_genassym.c

@@ -2,9 +2,9 @@

__FBSDID("$FreeBSD$");

#include <sys/param.h>

+#include <sys/systm.h>

#include <sys/assym.h>

#include <sys/resource.h>

-#include <sys/systm.h>

#include <amd64/linux32/linux.h>

#include <compat/linux/linux_mib.h>

diff --git a/sys/amd64/linux32/linux32_machdep.c b/sys/amd64/linux32/linux32_machdep.c
index 5599cbff2525..0bd398042c3f 100644
--- a/sys/amd64/linux32/linux32_machdep.c
+++ b/sys/amd64/linux32/linux32_machdep.c

@@ -34,27 +34,16 @@

__FBSDID("$FreeBSD$");

#include <sys/param.h>

-#include <sys/capsicum.h>

-#include <sys/clock.h>

#include <sys/fcntl.h>

-#include <sys/file.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/mutex.h>

#include <sys/priv.h>

#include <sys/proc.h>

#include <sys/reg.h>

-#include <sys/resource.h>

-#include <sys/resourcevar.h>

#include <sys/syscallsubr.h>

-#include <sys/sysproto.h>

-#include <sys/systm.h>

-#include <sys/unistd.h>

-#include <sys/wait.h>

#include <machine/frame.h>

#include <machine/md_var.h>

diff --git a/sys/amd64/linux32/linux32_sysvec.c b/sys/amd64/linux32/linux32_sysvec.c
index 8afa0f848e62..a67f2166deb0 100644
--- a/sys/amd64/linux32/linux32_sysvec.c
+++ b/sys/amd64/linux32/linux32_sysvec.c

@@ -42,7 +42,6 @@ __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>

@@ -53,23 +52,15 @@ __FBSDID("$FreeBSD$");

#include <sys/module.h>

#include <sys/mutex.h>

#include <sys/proc.h>

-#include <sys/resourcevar.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 <sys/eventhandler.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/md_var.h>