Module Name: src
Committed By: riastradh
Date: Fri Dec 6 16:18:41 UTC 2024
Modified Files:
src/sys/kern: exec_aout.c exec_ecoff.c exec_elf.c exec_script.c
exec_subr.c kern_exec.c
Log Message:
sys/kern/kern_exec.c, exec_*.c: Sort includes.
No functional change intended.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/kern/exec_aout.c
cvs rdiff -u -r1.32 -r1.33 src/sys/kern/exec_ecoff.c
cvs rdiff -u -r1.105 -r1.106 src/sys/kern/exec_elf.c
cvs rdiff -u -r1.83 -r1.84 src/sys/kern/exec_script.c
cvs rdiff -u -r1.88 -r1.89 src/sys/kern/exec_subr.c
cvs rdiff -u -r1.522 -r1.523 src/sys/kern/kern_exec.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/exec_aout.c
diff -u src/sys/kern/exec_aout.c:1.41 src/sys/kern/exec_aout.c:1.42
--- src/sys/kern/exec_aout.c:1.41 Wed Nov 20 19:37:53 2019
+++ src/sys/kern/exec_aout.c Fri Dec 6 16:18:41 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: exec_aout.c,v 1.41 2019/11/20 19:37:53 pgoyette Exp $ */
+/* $NetBSD: exec_aout.c,v 1.42 2024/12/06 16:18:41 riastradh Exp $ */
/*
* Copyright (c) 1993, 1994 Christopher G. Demetriou
@@ -31,16 +31,18 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exec_aout.c,v 1.41 2019/11/20 19:37:53 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exec_aout.c,v 1.42 2024/12/06 16:18:41 riastradh Exp $");
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/proc.h>
-#include <sys/vnode.h>
+#include <sys/types.h>
+
#include <sys/exec.h>
#include <sys/exec_aout.h>
-#include <sys/resourcevar.h>
#include <sys/module.h>
+#include <sys/proc.h>
+#include <sys/resourcevar.h>
+#include <sys/systm.h>
+#include <sys/vnode.h>
#include <uvm/uvm_extern.h>
Index: src/sys/kern/exec_ecoff.c
diff -u src/sys/kern/exec_ecoff.c:1.32 src/sys/kern/exec_ecoff.c:1.33
--- src/sys/kern/exec_ecoff.c:1.32 Wed Nov 20 19:37:53 2019
+++ src/sys/kern/exec_ecoff.c Fri Dec 6 16:18:41 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: exec_ecoff.c,v 1.32 2019/11/20 19:37:53 pgoyette Exp $ */
+/* $NetBSD: exec_ecoff.c,v 1.33 2024/12/06 16:18:41 riastradh Exp $ */
/*
* Copyright (c) 1994 Adam Glass
@@ -33,17 +33,19 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exec_ecoff.c,v 1.32 2019/11/20 19:37:53 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exec_ecoff.c,v 1.33 2024/12/06 16:18:41 riastradh Exp $");
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/proc.h>
-#include <sys/vnode.h>
+#include <sys/types.h>
+
#include <sys/exec.h>
-#include <sys/resourcevar.h>
-#include <sys/module.h>
#include <sys/exec.h>
#include <sys/exec_ecoff.h>
+#include <sys/module.h>
+#include <sys/proc.h>
+#include <sys/resourcevar.h>
+#include <sys/systm.h>
+#include <sys/vnode.h>
MODULE(MODULE_CLASS_EXEC, exec_ecoff, NULL);
Index: src/sys/kern/exec_elf.c
diff -u src/sys/kern/exec_elf.c:1.105 src/sys/kern/exec_elf.c:1.106
--- src/sys/kern/exec_elf.c:1.105 Thu Aug 17 06:58:26 2023
+++ src/sys/kern/exec_elf.c Fri Dec 6 16:18:41 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: exec_elf.c,v 1.105 2023/08/17 06:58:26 rin Exp $ */
+/* $NetBSD: exec_elf.c,v 1.106 2024/12/06 16:18:41 riastradh Exp $ */
/*-
* Copyright (c) 1994, 2000, 2005, 2015, 2020 The NetBSD Foundation, Inc.
@@ -57,32 +57,34 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: exec_elf.c,v 1.105 2023/08/17 06:58:26 rin Exp $");
+__KERNEL_RCSID(1, "$NetBSD: exec_elf.c,v 1.106 2024/12/06 16:18:41 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_pax.h"
#endif /* _KERNEL_OPT */
#include <sys/param.h>
-#include <sys/proc.h>
-#include <sys/kmem.h>
-#include <sys/namei.h>
-#include <sys/vnode.h>
+#include <sys/types.h>
+
+#include <sys/bitops.h>
+#include <sys/cpu.h>
#include <sys/exec.h>
#include <sys/exec_elf.h>
-#include <sys/syscall.h>
-#include <sys/signalvar.h>
+#include <sys/kauth.h>
+#include <sys/kmem.h>
#include <sys/mount.h>
+#include <sys/namei.h>
+#include <sys/pax.h>
+#include <sys/proc.h>
+#include <sys/signalvar.h>
#include <sys/stat.h>
-#include <sys/kauth.h>
-#include <sys/bitops.h>
+#include <sys/syscall.h>
+#include <sys/vnode.h>
-#include <sys/cpu.h>
#include <machine/reg.h>
#include <compat/common/compat_util.h>
-#include <sys/pax.h>
#include <uvm/uvm_param.h>
#define elf_check_header ELFNAME(check_header)
Index: src/sys/kern/exec_script.c
diff -u src/sys/kern/exec_script.c:1.83 src/sys/kern/exec_script.c:1.84
--- src/sys/kern/exec_script.c:1.83 Mon May 3 10:25:14 2021
+++ src/sys/kern/exec_script.c Fri Dec 6 16:18:41 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: exec_script.c,v 1.83 2021/05/03 10:25:14 fcambus Exp $ */
+/* $NetBSD: exec_script.c,v 1.84 2024/12/06 16:18:41 riastradh Exp $ */
/*
* Copyright (c) 1993, 1994, 1996 Christopher G. Demetriou
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exec_script.c,v 1.83 2021/05/03 10:25:14 fcambus Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exec_script.c,v 1.84 2024/12/06 16:18:41 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_script.h"
@@ -42,21 +42,23 @@ __KERNEL_RCSID(0, "$NetBSD: exec_script.
#endif
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/proc.h>
+#include <sys/types.h>
+
+#include <sys/exec.h>
+#include <sys/exec_elf.h>
+#include <sys/exec_script.h>
+#include <sys/file.h>
+#include <sys/filedesc.h>
#include <sys/kmem.h>
-#include <sys/vnode.h>
+#include <sys/module.h>
#include <sys/namei.h>
-#include <sys/file.h>
+#include <sys/proc.h>
+#include <sys/resourcevar.h>
#ifdef SETUIDSCRIPTS
#include <sys/stat.h>
#endif
-#include <sys/filedesc.h>
-#include <sys/exec.h>
-#include <sys/resourcevar.h>
-#include <sys/module.h>
-#include <sys/exec_script.h>
-#include <sys/exec_elf.h>
+#include <sys/systm.h>
+#include <sys/vnode.h>
MODULE(MODULE_CLASS_EXEC, exec_script, NULL);
Index: src/sys/kern/exec_subr.c
diff -u src/sys/kern/exec_subr.c:1.88 src/sys/kern/exec_subr.c:1.89
--- src/sys/kern/exec_subr.c:1.88 Tue Nov 21 14:35:36 2023
+++ src/sys/kern/exec_subr.c Fri Dec 6 16:18:41 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: exec_subr.c,v 1.88 2023/11/21 14:35:36 riastradh Exp $ */
+/* $NetBSD: exec_subr.c,v 1.89 2024/12/06 16:18:41 riastradh Exp $ */
/*
* Copyright (c) 1993, 1994, 1996 Christopher G. Demetriou
@@ -31,21 +31,23 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exec_subr.c,v 1.88 2023/11/21 14:35:36 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exec_subr.c,v 1.89 2024/12/06 16:18:41 riastradh Exp $");
#include "opt_pax.h"
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/proc.h>
-#include <sys/kmem.h>
-#include <sys/vnode.h>
-#include <sys/filedesc.h>
+#include <sys/types.h>
+
+#include <sys/device.h>
#include <sys/exec.h>
+#include <sys/filedesc.h>
+#include <sys/kmem.h>
#include <sys/mman.h>
-#include <sys/resourcevar.h>
-#include <sys/device.h>
#include <sys/pax.h>
+#include <sys/proc.h>
+#include <sys/resourcevar.h>
+#include <sys/systm.h>
+#include <sys/vnode.h>
#include <uvm/uvm_extern.h>
Index: src/sys/kern/kern_exec.c
diff -u src/sys/kern/kern_exec.c:1.522 src/sys/kern/kern_exec.c:1.523
--- src/sys/kern/kern_exec.c:1.522 Sun Nov 10 12:15:46 2024
+++ src/sys/kern/kern_exec.c Fri Dec 6 16:18:41 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_exec.c,v 1.522 2024/11/10 12:15:46 mlelstv Exp $ */
+/* $NetBSD: kern_exec.c,v 1.523 2024/12/06 16:18:41 riastradh Exp $ */
/*-
* Copyright (c) 2008, 2019, 2020 The NetBSD Foundation, Inc.
@@ -62,55 +62,56 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.522 2024/11/10 12:15:46 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.523 2024/12/06 16:18:41 riastradh Exp $");
#include "opt_exec.h"
#include "opt_execfmt.h"
#include "opt_ktrace.h"
#include "opt_modular.h"
+#include "opt_pax.h"
#include "opt_syscall_debug.h"
#include "veriexec.h"
-#include "opt_pax.h"
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/filedesc.h>
-#include <sys/kernel.h>
-#include <sys/proc.h>
-#include <sys/ptrace.h>
-#include <sys/mount.h>
-#include <sys/kmem.h>
-#include <sys/namei.h>
-#include <sys/vnode.h>
-#include <sys/file.h>
-#include <sys/filedesc.h>
+#include <sys/types.h>
+
#include <sys/acct.h>
#include <sys/atomic.h>
+#include <sys/cprng.h>
+#include <sys/cpu.h>
#include <sys/exec.h>
+#include <sys/file.h>
+#include <sys/filedesc.h>
#include <sys/futex.h>
+#include <sys/kauth.h>
+#include <sys/kernel.h>
+#include <sys/kmem.h>
#include <sys/ktrace.h>
-#include <sys/uidinfo.h>
-#include <sys/wait.h>
+#include <sys/lwpctl.h>
#include <sys/mman.h>
+#include <sys/module.h>
+#include <sys/mount.h>
+#include <sys/namei.h>
+#include <sys/pax.h>
+#include <sys/proc.h>
+#include <sys/prot.h>
+#include <sys/ptrace.h>
#include <sys/ras.h>
+#include <sys/sdt.h>
#include <sys/signalvar.h>
+#include <sys/spawn.h>
#include <sys/stat.h>
#include <sys/syscall.h>
-#include <sys/kauth.h>
-#include <sys/lwpctl.h>
-#include <sys/pax.h>
-#include <sys/cpu.h>
-#include <sys/module.h>
-#include <sys/syscallvar.h>
#include <sys/syscallargs.h>
-#include <sys/vfs_syscalls.h>
+#include <sys/syscallvar.h>
+#include <sys/systm.h>
+#include <sys/uidinfo.h>
#if NVERIEXEC > 0
#include <sys/verified_exec.h>
#endif /* NVERIEXEC > 0 */
-#include <sys/sdt.h>
-#include <sys/spawn.h>
-#include <sys/prot.h>
-#include <sys/cprng.h>
+#include <sys/vfs_syscalls.h>
+#include <sys/vnode.h>
+#include <sys/wait.h>
#include <uvm/uvm_extern.h>
