Module Name: src Committed By: riastradh Date: Fri Dec 6 18:36:31 UTC 2024
Modified Files: src/sys/kern: sys_socket.c uipc_accf.c uipc_domain.c uipc_mbuf.c uipc_mbufdebug.c uipc_proto.c uipc_sem.c uipc_socket.c uipc_socket2.c uipc_syscalls.c uipc_usrreq.c Log Message: sys/kern/sys_socket.c, uipc_*.c: Sort includes. No functional change intended. To generate a diff of this commit: cvs rdiff -u -r1.81 -r1.82 src/sys/kern/sys_socket.c cvs rdiff -u -r1.13 -r1.14 src/sys/kern/uipc_accf.c cvs rdiff -u -r1.109 -r1.110 src/sys/kern/uipc_domain.c cvs rdiff -u -r1.252 -r1.253 src/sys/kern/uipc_mbuf.c cvs rdiff -u -r1.7 -r1.8 src/sys/kern/uipc_mbufdebug.c cvs rdiff -u -r1.23 -r1.24 src/sys/kern/uipc_proto.c cvs rdiff -u -r1.60 -r1.61 src/sys/kern/uipc_sem.c cvs rdiff -u -r1.310 -r1.311 src/sys/kern/uipc_socket.c cvs rdiff -u -r1.143 -r1.144 src/sys/kern/uipc_socket2.c cvs rdiff -u -r1.212 -r1.213 src/sys/kern/uipc_syscalls.c cvs rdiff -u -r1.203 -r1.204 src/sys/kern/uipc_usrreq.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/sys_socket.c diff -u src/sys/kern/sys_socket.c:1.81 src/sys/kern/sys_socket.c:1.82 --- src/sys/kern/sys_socket.c:1.81 Sat Apr 22 13:53:02 2023 +++ src/sys/kern/sys_socket.c Fri Dec 6 18:36:31 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: sys_socket.c,v 1.81 2023/04/22 13:53:02 riastradh Exp $ */ +/* $NetBSD: sys_socket.c,v 1.82 2024/12/06 18:36:31 riastradh Exp $ */ /*- * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc. @@ -61,21 +61,22 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sys_socket.c,v 1.81 2023/04/22 13:53:02 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sys_socket.c,v 1.82 2024/12/06 18:36:31 riastradh Exp $"); #include <sys/param.h> -#include <sys/systm.h> -#include <sys/systm.h> +#include <sys/types.h> + #include <sys/file.h> +#include <sys/ioctl.h> +#include <sys/kauth.h> #include <sys/mbuf.h> +#include <sys/poll.h> +#include <sys/proc.h> #include <sys/protosw.h> #include <sys/socket.h> #include <sys/socketvar.h> -#include <sys/ioctl.h> #include <sys/stat.h> -#include <sys/poll.h> -#include <sys/proc.h> -#include <sys/kauth.h> +#include <sys/systm.h> #include <net/if.h> #include <net/route.h> Index: src/sys/kern/uipc_accf.c diff -u src/sys/kern/uipc_accf.c:1.13 src/sys/kern/uipc_accf.c:1.14 --- src/sys/kern/uipc_accf.c:1.13 Tue Feb 25 18:30:11 2014 +++ src/sys/kern/uipc_accf.c Fri Dec 6 18:36:31 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: uipc_accf.c,v 1.13 2014/02/25 18:30:11 pooka Exp $ */ +/* $NetBSD: uipc_accf.c,v 1.14 2024/12/06 18:36:31 riastradh Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -58,26 +58,28 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uipc_accf.c,v 1.13 2014/02/25 18:30:11 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uipc_accf.c,v 1.14 2024/12/06 18:36:31 riastradh Exp $"); #define ACCEPT_FILTER_MOD #include <sys/param.h> -#include <sys/systm.h> +#include <sys/types.h> + +#include <sys/atomic.h> #include <sys/domain.h> #include <sys/kernel.h> -#include <sys/lock.h> #include <sys/kmem.h> +#include <sys/lock.h> #include <sys/mbuf.h> -#include <sys/rwlock.h> +#include <sys/module.h> +#include <sys/once.h> #include <sys/protosw.h> -#include <sys/sysctl.h> +#include <sys/queue.h> +#include <sys/rwlock.h> #include <sys/socket.h> #include <sys/socketvar.h> -#include <sys/queue.h> -#include <sys/once.h> -#include <sys/atomic.h> -#include <sys/module.h> +#include <sys/sysctl.h> +#include <sys/systm.h> static krwlock_t accept_filter_lock; Index: src/sys/kern/uipc_domain.c diff -u src/sys/kern/uipc_domain.c:1.109 src/sys/kern/uipc_domain.c:1.110 --- src/sys/kern/uipc_domain.c:1.109 Thu Mar 30 15:58:21 2023 +++ src/sys/kern/uipc_domain.c Fri Dec 6 18:36:31 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: uipc_domain.c,v 1.109 2023/03/30 15:58:21 riastradh Exp $ */ +/* $NetBSD: uipc_domain.c,v 1.110 2024/12/06 18:36:31 riastradh Exp $ */ /* * Copyright (c) 1982, 1986, 1993 @@ -32,29 +32,31 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uipc_domain.c,v 1.109 2023/03/30 15:58:21 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uipc_domain.c,v 1.110 2024/12/06 18:36:31 riastradh Exp $"); #include <sys/param.h> -#include <sys/socket.h> -#include <sys/socketvar.h> -#include <sys/protosw.h> +#include <sys/types.h> + +#include <sys/callout.h> #include <sys/domain.h> -#include <sys/mbuf.h> -#include <sys/time.h> +#include <sys/file.h> +#include <sys/filedesc.h> +#include <sys/kauth.h> #include <sys/kernel.h> -#include <sys/systm.h> -#include <sys/callout.h> -#include <sys/queue.h> +#include <sys/mbuf.h> #include <sys/proc.h> +#include <sys/protosw.h> +#include <sys/queue.h> +#include <sys/socket.h> +#include <sys/socketvar.h> #include <sys/sysctl.h> +#include <sys/systm.h> +#include <sys/time.h> #include <sys/un.h> #include <sys/unpcb.h> -#include <sys/file.h> -#include <sys/filedesc.h> -#include <sys/kauth.h> -#include <netatalk/at.h> #include <net/if_dl.h> +#include <netatalk/at.h> #include <netinet/in.h> MALLOC_DECLARE(M_SOCKADDR); Index: src/sys/kern/uipc_mbuf.c diff -u src/sys/kern/uipc_mbuf.c:1.252 src/sys/kern/uipc_mbuf.c:1.253 --- src/sys/kern/uipc_mbuf.c:1.252 Mon Nov 27 02:50:27 2023 +++ src/sys/kern/uipc_mbuf.c Fri Dec 6 18:36:31 2024 @@ -1,4 +1,5 @@ -/* $NetBSD: uipc_mbuf.c,v 1.252 2023/11/27 02:50:27 ozaki-r Exp $ */ + +/* $NetBSD: uipc_mbuf.c,v 1.253 2024/12/06 18:36:31 riastradh Exp $ */ /* * Copyright (c) 1999, 2001, 2018 The NetBSD Foundation, Inc. @@ -62,29 +63,31 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.252 2023/11/27 02:50:27 ozaki-r Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.253 2024/12/06 18:36:31 riastradh Exp $"); #ifdef _KERNEL_OPT +#include "ether.h" +#include "opt_ddb.h" #include "opt_mbuftrace.h" #include "opt_nmbclusters.h" -#include "opt_ddb.h" -#include "ether.h" #endif #include <sys/param.h> -#include <sys/systm.h> +#include <sys/types.h> + #include <sys/atomic.h> #include <sys/cpu.h> -#include <sys/proc.h> -#include <sys/mbuf.h> -#include <sys/kernel.h> -#include <sys/syslog.h> #include <sys/domain.h> -#include <sys/protosw.h> +#include <sys/kernel.h> +#include <sys/mbuf.h> #include <sys/percpu.h> #include <sys/pool.h> +#include <sys/proc.h> +#include <sys/protosw.h> #include <sys/socket.h> #include <sys/sysctl.h> +#include <sys/syslog.h> +#include <sys/systm.h> #include <net/if.h> Index: src/sys/kern/uipc_mbufdebug.c diff -u src/sys/kern/uipc_mbufdebug.c:1.7 src/sys/kern/uipc_mbufdebug.c:1.8 --- src/sys/kern/uipc_mbufdebug.c:1.7 Thu Oct 18 05:44:19 2018 +++ src/sys/kern/uipc_mbufdebug.c Fri Dec 6 18:36:31 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: uipc_mbufdebug.c,v 1.7 2018/10/18 05:44:19 msaitoh Exp $ */ +/* $NetBSD: uipc_mbufdebug.c,v 1.8 2024/12/06 18:36:31 riastradh Exp $ */ /* * Copyright (C) 2017 Internet Initiative Japan Inc. @@ -27,26 +27,28 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uipc_mbufdebug.c,v 1.7 2018/10/18 05:44:19 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uipc_mbufdebug.c,v 1.8 2024/12/06 18:36:31 riastradh Exp $"); #include <sys/param.h> -#include <sys/systm.h> -#include <sys/proc.h> +#include <sys/types.h> + #include <sys/malloc.h> #include <sys/mbuf.h> +#include <sys/proc.h> +#include <sys/systm.h> #include <net/if.h> +#include <net/if_arp.h> #include <net/if_ether.h> #include <net/ppp_defs.h> -#include <net/if_arp.h> +#include <netinet/icmp6.h> +#include <netinet/if_inarp.h> #include <netinet/in.h> #include <netinet/in_systm.h> #include <netinet/ip.h> -#include <netinet/ip_icmp.h> #include <netinet/ip6.h> -#include <netinet/icmp6.h> -#include <netinet/if_inarp.h> +#include <netinet/ip_icmp.h> #include <netinet/tcp.h> #include <netinet/udp.h> Index: src/sys/kern/uipc_proto.c diff -u src/sys/kern/uipc_proto.c:1.23 src/sys/kern/uipc_proto.c:1.24 --- src/sys/kern/uipc_proto.c:1.23 Sun May 18 14:46:15 2014 +++ src/sys/kern/uipc_proto.c Fri Dec 6 18:36:31 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: uipc_proto.c,v 1.23 2014/05/18 14:46:15 rmind Exp $ */ +/* $NetBSD: uipc_proto.c,v 1.24 2024/12/06 18:36:31 riastradh Exp $ */ /*- * Copyright (c) 1982, 1986, 1993 @@ -32,15 +32,16 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uipc_proto.c,v 1.23 2014/05/18 14:46:15 rmind Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uipc_proto.c,v 1.24 2024/12/06 18:36:31 riastradh Exp $"); #include <sys/param.h> -#include <sys/socket.h> -#include <sys/protosw.h> + #include <sys/domain.h> #include <sys/mbuf.h> -#include <sys/un.h> +#include <sys/protosw.h> +#include <sys/socket.h> #include <sys/socketvar.h> +#include <sys/un.h> #include <net/if.h> #include <net/raw_cb.h> Index: src/sys/kern/uipc_sem.c diff -u src/sys/kern/uipc_sem.c:1.60 src/sys/kern/uipc_sem.c:1.61 --- src/sys/kern/uipc_sem.c:1.60 Mon Dec 14 23:12:12 2020 +++ src/sys/kern/uipc_sem.c Fri Dec 6 18:36:31 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: uipc_sem.c,v 1.60 2020/12/14 23:12:12 chs Exp $ */ +/* $NetBSD: uipc_sem.c,v 1.61 2024/12/06 18:36:31 riastradh Exp $ */ /*- * Copyright (c) 2011, 2019 The NetBSD Foundation, Inc. @@ -60,33 +60,33 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uipc_sem.c,v 1.60 2020/12/14 23:12:12 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uipc_sem.c,v 1.61 2024/12/06 18:36:31 riastradh Exp $"); #include <sys/param.h> -#include <sys/kernel.h> +#include <sys/types.h> #include <sys/atomic.h> -#include <sys/proc.h> -#include <sys/lwp.h> -#include <sys/ksem.h> -#include <sys/syscall.h> -#include <sys/stat.h> -#include <sys/kmem.h> +#include <sys/cprng.h> #include <sys/fcntl.h> #include <sys/file.h> #include <sys/filedesc.h> #include <sys/kauth.h> +#include <sys/kernel.h> +#include <sys/kmem.h> +#include <sys/ksem.h> +#include <sys/lwp.h> #include <sys/module.h> #include <sys/mount.h> #include <sys/mutex.h> +#include <sys/proc.h> #include <sys/rwlock.h> #include <sys/semaphore.h> +#include <sys/stat.h> #include <sys/syscall.h> #include <sys/syscallargs.h> #include <sys/syscallvar.h> #include <sys/sysctl.h> #include <sys/uidinfo.h> -#include <sys/cprng.h> MODULE(MODULE_CLASS_MISC, ksem, NULL); Index: src/sys/kern/uipc_socket.c diff -u src/sys/kern/uipc_socket.c:1.310 src/sys/kern/uipc_socket.c:1.311 --- src/sys/kern/uipc_socket.c:1.310 Fri Jul 5 04:31:53 2024 +++ src/sys/kern/uipc_socket.c Fri Dec 6 18:36:31 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: uipc_socket.c,v 1.310 2024/07/05 04:31:53 rin Exp $ */ +/* $NetBSD: uipc_socket.c,v 1.311 2024/12/06 18:36:31 riastradh Exp $ */ /* * Copyright (c) 2002, 2007, 2008, 2009, 2023 The NetBSD Foundation, Inc. @@ -71,44 +71,46 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.310 2024/07/05 04:31:53 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.311 2024/12/06 18:36:31 riastradh Exp $"); #ifdef _KERNEL_OPT #include "opt_compat_netbsd.h" -#include "opt_sock_counters.h" -#include "opt_sosend_loan.h" #include "opt_mbuftrace.h" -#include "opt_somaxkva.h" #include "opt_multiprocessor.h" /* XXX */ -#include "opt_sctp.h" #include "opt_pipe.h" +#include "opt_sctp.h" +#include "opt_sock_counters.h" +#include "opt_somaxkva.h" +#include "opt_sosend_loan.h" #endif #include <sys/param.h> -#include <sys/systm.h> -#include <sys/proc.h> +#include <sys/types.h> + +#include <sys/compat_stub.h> +#include <sys/condvar.h> +#include <sys/domain.h> +#include <sys/event.h> #include <sys/file.h> #include <sys/filedesc.h> +#include <sys/kauth.h> +#include <sys/kernel.h> #include <sys/kmem.h> +#include <sys/kthread.h> #include <sys/mbuf.h> -#include <sys/domain.h> -#include <sys/kernel.h> +#include <sys/mutex.h> +#include <sys/poll.h> +#include <sys/proc.h> #include <sys/protosw.h> +#include <sys/resourcevar.h> +#include <sys/signalvar.h> #include <sys/socket.h> #include <sys/socketvar.h> -#include <sys/signalvar.h> -#include <sys/resourcevar.h> +#include <sys/systm.h> #include <sys/uidinfo.h> -#include <sys/event.h> -#include <sys/poll.h> -#include <sys/kauth.h> -#include <sys/mutex.h> -#include <sys/condvar.h> -#include <sys/kthread.h> -#include <sys/compat_stub.h> -#include <compat/sys/time.h> #include <compat/sys/socket.h> +#include <compat/sys/time.h> #include <uvm/uvm_extern.h> #include <uvm/uvm_loan.h> Index: src/sys/kern/uipc_socket2.c diff -u src/sys/kern/uipc_socket2.c:1.143 src/sys/kern/uipc_socket2.c:1.144 --- src/sys/kern/uipc_socket2.c:1.143 Wed Jan 3 18:10:42 2024 +++ src/sys/kern/uipc_socket2.c Fri Dec 6 18:36:31 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: uipc_socket2.c,v 1.143 2024/01/03 18:10:42 andvar Exp $ */ +/* $NetBSD: uipc_socket2.c,v 1.144 2024/12/06 18:36:31 riastradh Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -58,7 +58,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uipc_socket2.c,v 1.143 2024/01/03 18:10:42 andvar Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uipc_socket2.c,v 1.144 2024/12/06 18:36:31 riastradh Exp $"); #ifdef _KERNEL_OPT #include "opt_ddb.h" @@ -68,19 +68,21 @@ __KERNEL_RCSID(0, "$NetBSD: uipc_socket2 #endif #include <sys/param.h> -#include <sys/systm.h> -#include <sys/proc.h> -#include <sys/file.h> +#include <sys/types.h> + #include <sys/buf.h> -#include <sys/mbuf.h> -#include <sys/protosw.h> #include <sys/domain.h> +#include <sys/file.h> +#include <sys/kauth.h> +#include <sys/mbuf.h> #include <sys/poll.h> +#include <sys/pool.h> +#include <sys/proc.h> +#include <sys/protosw.h> +#include <sys/signalvar.h> #include <sys/socket.h> #include <sys/socketvar.h> -#include <sys/signalvar.h> -#include <sys/kauth.h> -#include <sys/pool.h> +#include <sys/systm.h> #include <sys/uidinfo.h> #ifdef DDB Index: src/sys/kern/uipc_syscalls.c diff -u src/sys/kern/uipc_syscalls.c:1.212 src/sys/kern/uipc_syscalls.c:1.213 --- src/sys/kern/uipc_syscalls.c:1.212 Fri Jul 5 04:31:53 2024 +++ src/sys/kern/uipc_syscalls.c Fri Dec 6 18:36:31 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: uipc_syscalls.c,v 1.212 2024/07/05 04:31:53 rin Exp $ */ +/* $NetBSD: uipc_syscalls.c,v 1.213 2024/12/06 18:36:31 riastradh Exp $ */ /*- * Copyright (c) 2008, 2009, 2023 The NetBSD Foundation, Inc. @@ -60,40 +60,42 @@ * @(#)uipc_syscalls.c 8.6 (Berkeley) 2/14/95 */ +#define MBUFTYPES + #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls.c,v 1.212 2024/07/05 04:31:53 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls.c,v 1.213 2024/12/06 18:36:31 riastradh Exp $"); #ifdef _KERNEL_OPT #include "opt_pipe.h" #include "opt_sctp.h" #endif -#define MBUFTYPES #include <sys/param.h> -#include <sys/systm.h> -#include <sys/filedesc.h> -#include <sys/proc.h> -#include <sys/file.h> +#include <sys/types.h> + +#include <sys/atomic.h> #include <sys/buf.h> +#include <sys/event.h> +#include <sys/file.h> +#include <sys/filedesc.h> +#include <sys/kauth.h> +#include <sys/ktrace.h> #include <sys/mbuf.h> +#include <sys/mount.h> +#include <sys/proc.h> #include <sys/protosw.h> +#include <sys/signalvar.h> #include <sys/socket.h> #include <sys/socketvar.h> -#include <sys/signalvar.h> +#include <sys/syscallargs.h> +#include <sys/systm.h> #include <sys/un.h> -#include <sys/ktrace.h> -#include <sys/event.h> -#include <sys/atomic.h> -#include <sys/kauth.h> #ifdef SCTP -#include <netinet/sctp_uio.h> #include <netinet/sctp_peeloff.h> +#include <netinet/sctp_uio.h> #endif -#include <sys/mount.h> -#include <sys/syscallargs.h> - /* * System call interface to the socket abstraction. */ Index: src/sys/kern/uipc_usrreq.c diff -u src/sys/kern/uipc_usrreq.c:1.203 src/sys/kern/uipc_usrreq.c:1.204 --- src/sys/kern/uipc_usrreq.c:1.203 Sat May 28 22:08:46 2022 +++ src/sys/kern/uipc_usrreq.c Fri Dec 6 18:36:31 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: uipc_usrreq.c,v 1.203 2022/05/28 22:08:46 andvar Exp $ */ +/* $NetBSD: uipc_usrreq.c,v 1.204 2024/12/06 18:36:31 riastradh Exp $ */ /*- * Copyright (c) 1998, 2000, 2004, 2008, 2009, 2020 The NetBSD Foundation, Inc. @@ -96,37 +96,39 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq.c,v 1.203 2022/05/28 22:08:46 andvar Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq.c,v 1.204 2024/12/06 18:36:31 riastradh Exp $"); #ifdef _KERNEL_OPT #include "opt_compat_netbsd.h" #endif #include <sys/param.h> -#include <sys/systm.h> -#include <sys/proc.h> -#include <sys/filedesc.h> +#include <sys/types.h> + +#include <sys/atomic.h> +#include <sys/compat_stub.h> #include <sys/domain.h> +#include <sys/file.h> +#include <sys/filedesc.h> +#include <sys/kauth.h> +#include <sys/kernel.h> +#include <sys/kmem.h> +#include <sys/kthread.h> +#include <sys/mbuf.h> +#include <sys/namei.h> +#include <sys/proc.h> #include <sys/protosw.h> #include <sys/socket.h> #include <sys/socketvar.h> -#include <sys/unpcb.h> -#include <sys/un.h> -#include <sys/namei.h> -#include <sys/vnode.h> -#include <sys/file.h> #include <sys/stat.h> -#include <sys/mbuf.h> -#include <sys/kauth.h> -#include <sys/kmem.h> -#include <sys/atomic.h> +#include <sys/systm.h> #include <sys/uidinfo.h> -#include <sys/kernel.h> -#include <sys/kthread.h> -#include <sys/compat_stub.h> +#include <sys/un.h> +#include <sys/unpcb.h> +#include <sys/vnode.h> -#include <compat/sys/socket.h> #include <compat/net/route_70.h> +#include <compat/sys/socket.h> /* * Unix communications domain.