Date: Fri, 23 Mar 2018 17:16:36 +0000 (UTC) From: Ed Maste <emaste@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r331439 - in head/sys: amd64/linux amd64/linux32 i386/linux Message-ID: <201803231716.w2NHGagt025060@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: emaste Date: Fri Mar 23 17:16:36 2018 New Revision: 331439 URL: https://svnweb.freebsd.org/changeset/base/331439 Log: Sort headers in MD Linuxulator files Bring #includes closer to style(9) and reduce differences between the (three) MD versions of linux_machdep.c and linux_sysvec.c. Sponsored by: Turing Robotic Industries Inc. Modified: head/sys/amd64/linux/linux_machdep.c head/sys/amd64/linux/linux_sysvec.c head/sys/amd64/linux32/linux32_machdep.c head/sys/amd64/linux32/linux32_sysvec.c head/sys/i386/linux/linux_machdep.c Modified: head/sys/amd64/linux/linux_machdep.c ============================================================================== --- head/sys/amd64/linux/linux_machdep.c Fri Mar 23 17:03:42 2018 (r331438) +++ head/sys/amd64/linux/linux_machdep.c Fri Mar 23 17:16:36 2018 (r331439) @@ -33,15 +33,14 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> -#include <sys/kernel.h> -#include <sys/systm.h> #include <sys/capsicum.h> +#include <sys/clock.h> #include <sys/dirent.h> -#include <sys/file.h> #include <sys/fcntl.h> +#include <sys/file.h> #include <sys/filedesc.h> -#include <sys/clock.h> #include <sys/imgact.h> +#include <sys/kernel.h> #include <sys/ktr.h> #include <sys/limits.h> #include <sys/lock.h> @@ -55,8 +54,9 @@ __FBSDID("$FreeBSD$"); #include <sys/sched.h> #include <sys/syscallsubr.h> #include <sys/sysproto.h> -#include <sys/vnode.h> +#include <sys/systm.h> #include <sys/unistd.h> +#include <sys/vnode.h> #include <sys/wait.h> #include <security/mac/mac_framework.h> @@ -72,21 +72,21 @@ __FBSDID("$FreeBSD$"); #include <machine/segments.h> #include <machine/specialreg.h> -#include <vm/vm.h> #include <vm/pmap.h> +#include <vm/vm.h> #include <vm/vm_extern.h> #include <vm/vm_kern.h> #include <vm/vm_map.h> #include <amd64/linux/linux.h> #include <amd64/linux/linux_proto.h> -#include <compat/linux/linux_ipc.h> +#include <compat/linux/linux_emul.h> #include <compat/linux/linux_file.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> -#include <compat/linux/linux_emul.h> #include <x86/include/sysarch.h> Modified: head/sys/amd64/linux/linux_sysvec.c ============================================================================== --- head/sys/amd64/linux/linux_sysvec.c Fri Mar 23 17:03:42 2018 (r331438) +++ head/sys/amd64/linux/linux_sysvec.c Fri Mar 23 17:16:36 2018 (r331439) @@ -53,8 +53,8 @@ __FBSDID("$FreeBSD$"); #include <sys/proc.h> #include <sys/resourcevar.h> #include <sys/signalvar.h> -#include <sys/sysctl.h> #include <sys/syscallsubr.h> +#include <sys/sysctl.h> #include <sys/sysent.h> #include <sys/sysproto.h> #include <sys/vnode.h> Modified: head/sys/amd64/linux32/linux32_machdep.c ============================================================================== --- head/sys/amd64/linux32/linux32_machdep.c Fri Mar 23 17:03:42 2018 (r331438) +++ head/sys/amd64/linux32/linux32_machdep.c Fri Mar 23 17:16:36 2018 (r331439) @@ -36,13 +36,12 @@ __FBSDID("$FreeBSD$"); #include "opt_compat.h" #include <sys/param.h> -#include <sys/kernel.h> -#include <sys/systm.h> #include <sys/capsicum.h> -#include <sys/file.h> -#include <sys/fcntl.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> @@ -54,6 +53,7 @@ __FBSDID("$FreeBSD$"); #include <sys/resourcevar.h> #include <sys/syscallsubr.h> #include <sys/sysproto.h> +#include <sys/systm.h> #include <sys/unistd.h> #include <sys/wait.h> @@ -63,19 +63,19 @@ __FBSDID("$FreeBSD$"); #include <machine/segments.h> #include <machine/specialreg.h> -#include <vm/vm.h> #include <vm/pmap.h> +#include <vm/vm.h> #include <vm/vm_map.h> #include <compat/freebsd32/freebsd32_util.h> #include <amd64/linux32/linux.h> #include <amd64/linux32/linux32_proto.h> +#include <compat/linux/linux_emul.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> -#include <compat/linux/linux_emul.h> static void bsd_to_linux_rusage(struct rusage *ru, struct l_rusage *lru); Modified: head/sys/amd64/linux32/linux32_sysvec.c ============================================================================== --- head/sys/amd64/linux32/linux32_sysvec.c Fri Mar 23 17:03:42 2018 (r331438) +++ head/sys/amd64/linux32/linux32_sysvec.c Fri Mar 23 17:16:36 2018 (r331439) @@ -56,8 +56,8 @@ __FBSDID("$FreeBSD$"); #include <sys/proc.h> #include <sys/resourcevar.h> #include <sys/signalvar.h> -#include <sys/sysctl.h> #include <sys/syscallsubr.h> +#include <sys/sysctl.h> #include <sys/sysent.h> #include <sys/sysproto.h> #include <sys/vnode.h> Modified: head/sys/i386/linux/linux_machdep.c ============================================================================== --- head/sys/i386/linux/linux_machdep.c Fri Mar 23 17:03:42 2018 (r331438) +++ head/sys/i386/linux/linux_machdep.c Fri Mar 23 17:16:36 2018 (r331439) @@ -30,45 +30,45 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> -#include <sys/systm.h> #include <sys/capsicum.h> -#include <sys/file.h> #include <sys/fcntl.h> +#include <sys/file.h> #include <sys/imgact.h> #include <sys/lock.h> #include <sys/malloc.h> #include <sys/mman.h> #include <sys/mutex.h> -#include <sys/sx.h> #include <sys/priv.h> #include <sys/proc.h> #include <sys/queue.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/wait.h> -#include <sys/sched.h> #include <machine/frame.h> #include <machine/psl.h> #include <machine/segments.h> #include <machine/sysarch.h> -#include <vm/vm.h> #include <vm/pmap.h> +#include <vm/vm.h> #include <vm/vm_map.h> #include <i386/linux/linux.h> #include <i386/linux/linux_proto.h> +#include <compat/linux/linux_emul.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> -#include <compat/linux/linux_emul.h> #include <i386/include/pcb.h> /* needed for pcb definition in linux_set_thread_area */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201803231716.w2NHGagt025060>