diff options
70 files changed, 67 insertions, 267 deletions
diff --git a/sys/amd64/amd64/initcpu.c b/sys/amd64/amd64/initcpu.c index 077aa31..3b1182f 100644 --- a/sys/amd64/amd64/initcpu.c +++ b/sys/amd64/amd64/initcpu.c @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: initcpu.c,v 1.7 1997/07/24 14:19:25 kato Exp $ + * $Id: initcpu.c,v 1.8 1997/10/06 08:08:41 kato Exp $ */ #include "opt_cpu.h" @@ -35,7 +35,6 @@ #include <sys/kernel.h> #include <sys/systm.h> -#include <machine/cpu.h> #include <machine/cputypes.h> #include <machine/md_var.h> #include <machine/specialreg.h> diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c index ad3841a..a31857a 100644 --- a/sys/amd64/amd64/mp_machdep.c +++ b/sys/amd64/amd64/mp_machdep.c @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: mp_machdep.c,v 1.57 1997/10/10 09:44:03 peter Exp $ + * $Id: mp_machdep.c,v 1.58 1997/10/12 15:24:39 peter Exp $ */ #include "opt_smp.h" @@ -47,7 +47,6 @@ #include <machine/smptests.h> /** TEST_DEFAULT_CONFIG, TEST_TEST1 */ #include <machine/tss.h> #include <machine/specialreg.h> -#include <machine/cpu.h> #include <machine/cputypes.h> #include <i386/i386/cons.h> /* cngetc() */ diff --git a/sys/amd64/amd64/mptable.c b/sys/amd64/amd64/mptable.c index ad3841a..a31857a 100644 --- a/sys/amd64/amd64/mptable.c +++ b/sys/amd64/amd64/mptable.c @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: mp_machdep.c,v 1.57 1997/10/10 09:44:03 peter Exp $ + * $Id: mp_machdep.c,v 1.58 1997/10/12 15:24:39 peter Exp $ */ #include "opt_smp.h" @@ -47,7 +47,6 @@ #include <machine/smptests.h> /** TEST_DEFAULT_CONFIG, TEST_TEST1 */ #include <machine/tss.h> #include <machine/specialreg.h> -#include <machine/cpu.h> #include <machine/cputypes.h> #include <i386/i386/cons.h> /* cngetc() */ diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index 38f878a..03a30f0 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 - * $Id: pmap.c,v 1.167 1997/10/26 12:33:39 dyson Exp $ + * $Id: pmap.c,v 1.168 1997/10/27 00:34:15 dyson Exp $ */ /* @@ -68,12 +68,9 @@ * and to when physical maps must be made correct. */ -#include "opt_cpu.h" - #include <sys/param.h> #include <sys/systm.h> #include <sys/proc.h> -#include <sys/malloc.h> #include <sys/msgbuf.h> #include <sys/vmmeter.h> #include <sys/mman.h> @@ -93,7 +90,6 @@ #include <sys/user.h> -#include <machine/cpu.h> #include <machine/cputypes.h> #include <machine/md_var.h> #include <machine/specialreg.h> diff --git a/sys/amd64/include/mptable.h b/sys/amd64/include/mptable.h index ad3841a..a31857a 100644 --- a/sys/amd64/include/mptable.h +++ b/sys/amd64/include/mptable.h @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: mp_machdep.c,v 1.57 1997/10/10 09:44:03 peter Exp $ + * $Id: mp_machdep.c,v 1.58 1997/10/12 15:24:39 peter Exp $ */ #include "opt_smp.h" @@ -47,7 +47,6 @@ #include <machine/smptests.h> /** TEST_DEFAULT_CONFIG, TEST_TEST1 */ #include <machine/tss.h> #include <machine/specialreg.h> -#include <machine/cpu.h> #include <machine/cputypes.h> #include <i386/i386/cons.h> /* cngetc() */ diff --git a/sys/dev/eisa/eisaconf.c b/sys/dev/eisa/eisaconf.c index 0899fee..f1e7262 100644 --- a/sys/dev/eisa/eisaconf.c +++ b/sys/dev/eisa/eisaconf.c @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: eisaconf.c,v 1.30 1997/08/21 20:33:29 bde Exp $ + * $Id: eisaconf.c,v 1.31 1997/09/21 21:35:23 gibbs Exp $ */ #include "opt_eisa.h" @@ -42,9 +42,6 @@ #include <i386/eisa/eisaconf.h> -#include <i386/isa/icu.h> /* Hmmm. Interrupt stuff? */ - -#include <i386/isa/intr_machdep.h> #include <sys/interrupt.h> struct eisa_device_node{ diff --git a/sys/dev/en/if_en_pci.c b/sys/dev/en/if_en_pci.c index bebff3f..d1853b5 100644 --- a/sys/dev/en/if_en_pci.c +++ b/sys/dev/en/if_en_pci.c @@ -48,7 +48,6 @@ #if (NEN > 0) && (NPCI > 0) #include <sys/param.h> -#include <sys/types.h> #include <sys/kernel.h> #include <sys/systm.h> #ifndef SHUTDOWN_PRE_SYNC @@ -63,11 +62,8 @@ #include <sys/devconf.h> #endif #include <sys/malloc.h> -#include <sys/mbuf.h> #include <sys/socket.h> -#include <sys/socketvar.h> -#include <machine/cpufunc.h> /* for rdtsc proto for clock.h below */ #include <machine/clock.h> /* for DELAY */ #include <net/if.h> diff --git a/sys/dev/fxp/if_fxp.c b/sys/dev/fxp/if_fxp.c index 43f03bc..ef3284f 100644 --- a/sys/dev/fxp/if_fxp.c +++ b/sys/dev/fxp/if_fxp.c @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: if_fxp.c,v 1.44 1997/10/17 06:27:44 davidg Exp $ + * $Id: if_fxp.c,v 1.45 1997/10/23 01:45:15 davidg Exp $ */ /* @@ -42,7 +42,6 @@ #include <sys/malloc.h> #include <sys/kernel.h> #include <sys/socket.h> -#include <sys/syslog.h> #include <net/if.h> #include <net/if_dl.h> diff --git a/sys/i386/eisa/eisaconf.c b/sys/i386/eisa/eisaconf.c index 0899fee..f1e7262 100644 --- a/sys/i386/eisa/eisaconf.c +++ b/sys/i386/eisa/eisaconf.c @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: eisaconf.c,v 1.30 1997/08/21 20:33:29 bde Exp $ + * $Id: eisaconf.c,v 1.31 1997/09/21 21:35:23 gibbs Exp $ */ #include "opt_eisa.h" @@ -42,9 +42,6 @@ #include <i386/eisa/eisaconf.h> -#include <i386/isa/icu.h> /* Hmmm. Interrupt stuff? */ - -#include <i386/isa/intr_machdep.h> #include <sys/interrupt.h> struct eisa_device_node{ diff --git a/sys/i386/i386/initcpu.c b/sys/i386/i386/initcpu.c index 077aa31..3b1182f 100644 --- a/sys/i386/i386/initcpu.c +++ b/sys/i386/i386/initcpu.c @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: initcpu.c,v 1.7 1997/07/24 14:19:25 kato Exp $ + * $Id: initcpu.c,v 1.8 1997/10/06 08:08:41 kato Exp $ */ #include "opt_cpu.h" @@ -35,7 +35,6 @@ #include <sys/kernel.h> #include <sys/systm.h> -#include <machine/cpu.h> #include <machine/cputypes.h> #include <machine/md_var.h> #include <machine/specialreg.h> diff --git a/sys/i386/i386/microtime.s b/sys/i386/i386/microtime.s index 16571a9..62cdac5 100644 --- a/sys/i386/i386/microtime.s +++ b/sys/i386/i386/microtime.s @@ -32,11 +32,9 @@ * SUCH DAMAGE. * * from: Steve McCanne's microtime code - * $Id: microtime.s,v 1.10 1997/09/07 21:50:13 smp Exp smp $ + * $Id: microtime.s,v 1.33 1997/09/07 22:03:51 fsmp Exp $ */ -#include "opt_cpu.h" - #include <machine/asmacros.h> #include <i386/isa/icu.h> diff --git a/sys/i386/i386/mp_machdep.c b/sys/i386/i386/mp_machdep.c index ad3841a..a31857a 100644 --- a/sys/i386/i386/mp_machdep.c +++ b/sys/i386/i386/mp_machdep.c @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: mp_machdep.c,v 1.57 1997/10/10 09:44:03 peter Exp $ + * $Id: mp_machdep.c,v 1.58 1997/10/12 15:24:39 peter Exp $ */ #include "opt_smp.h" @@ -47,7 +47,6 @@ #include <machine/smptests.h> /** TEST_DEFAULT_CONFIG, TEST_TEST1 */ #include <machine/tss.h> #include <machine/specialreg.h> -#include <machine/cpu.h> #include <machine/cputypes.h> #include <i386/i386/cons.h> /* cngetc() */ diff --git a/sys/i386/i386/mptable.c b/sys/i386/i386/mptable.c index ad3841a..a31857a 100644 --- a/sys/i386/i386/mptable.c +++ b/sys/i386/i386/mptable.c @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: mp_machdep.c,v 1.57 1997/10/10 09:44:03 peter Exp $ + * $Id: mp_machdep.c,v 1.58 1997/10/12 15:24:39 peter Exp $ */ #include "opt_smp.h" @@ -47,7 +47,6 @@ #include <machine/smptests.h> /** TEST_DEFAULT_CONFIG, TEST_TEST1 */ #include <machine/tss.h> #include <machine/specialreg.h> -#include <machine/cpu.h> #include <machine/cputypes.h> #include <i386/i386/cons.h> /* cngetc() */ diff --git a/sys/i386/i386/perfmon.c b/sys/i386/i386/perfmon.c index 5542173..5f3a5cc 100644 --- a/sys/i386/i386/perfmon.c +++ b/sys/i386/i386/perfmon.c @@ -26,17 +26,14 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: perfmon.c,v 1.10 1997/02/22 09:32:35 peter Exp $ + * $Id: perfmon.c,v 1.11 1997/07/01 01:18:38 bde Exp $ */ -#include "opt_cpu.h" - #include <sys/param.h> #include <sys/systm.h> #include <sys/fcntl.h> #ifndef SMP -#include <machine/cpu.h> #include <machine/cputypes.h> #include <machine/clock.h> #endif diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c index 38f878a..03a30f0 100644 --- a/sys/i386/i386/pmap.c +++ b/sys/i386/i386/pmap.c @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 - * $Id: pmap.c,v 1.167 1997/10/26 12:33:39 dyson Exp $ + * $Id: pmap.c,v 1.168 1997/10/27 00:34:15 dyson Exp $ */ /* @@ -68,12 +68,9 @@ * and to when physical maps must be made correct. */ -#include "opt_cpu.h" - #include <sys/param.h> #include <sys/systm.h> #include <sys/proc.h> -#include <sys/malloc.h> #include <sys/msgbuf.h> #include <sys/vmmeter.h> #include <sys/mman.h> @@ -93,7 +90,6 @@ #include <sys/user.h> -#include <machine/cpu.h> #include <machine/cputypes.h> #include <machine/md_var.h> #include <machine/specialreg.h> diff --git a/sys/i386/include/mptable.h b/sys/i386/include/mptable.h index ad3841a..a31857a 100644 --- a/sys/i386/include/mptable.h +++ b/sys/i386/include/mptable.h @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: mp_machdep.c,v 1.57 1997/10/10 09:44:03 peter Exp $ + * $Id: mp_machdep.c,v 1.58 1997/10/12 15:24:39 peter Exp $ */ #include "opt_smp.h" @@ -47,7 +47,6 @@ #include <machine/smptests.h> /** TEST_DEFAULT_CONFIG, TEST_TEST1 */ #include <machine/tss.h> #include <machine/specialreg.h> -#include <machine/cpu.h> #include <machine/cputypes.h> #include <i386/i386/cons.h> /* cngetc() */ diff --git a/sys/i386/isa/random_machdep.c b/sys/i386/isa/random_machdep.c index 70d3c95..3c4f9eb 100644 --- a/sys/i386/isa/random_machdep.c +++ b/sys/i386/isa/random_machdep.c @@ -1,7 +1,7 @@ /* * random_machdep.c -- A strong random number generator * - * $Id: random_machdep.c,v 1.17 1997/05/04 14:28:22 peter Exp $ + * $Id: random_machdep.c,v 1.18 1997/09/14 03:19:15 peter Exp $ * * Version 0.95, last modified 18-Oct-95 * @@ -39,14 +39,11 @@ * OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "opt_cpu.h" - #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/select.h> #include <sys/poll.h> -#include <sys/fcntl.h> #include <machine/clock.h> #include <machine/random.h> diff --git a/sys/kern/kern_lkm.c b/sys/kern/kern_lkm.c index 22de106..f317899 100644 --- a/sys/kern/kern_lkm.c +++ b/sys/kern/kern_lkm.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: kern_lkm.c,v 1.42 1997/09/14 02:52:14 peter Exp $ + * $Id: kern_lkm.c,v 1.43 1997/10/11 13:11:32 phk Exp $ */ #include <sys/param.h> @@ -40,7 +40,6 @@ #include <sys/conf.h> #include <sys/fcntl.h> #include <sys/kernel.h> -#include <sys/malloc.h> #include <sys/mount.h> #include <sys/sysent.h> #include <sys/exec.h> diff --git a/sys/kern/kern_lock.c b/sys/kern/kern_lock.c index ff1b252..4d0e4de 100644 --- a/sys/kern/kern_lock.c +++ b/sys/kern/kern_lock.c @@ -38,7 +38,7 @@ * SUCH DAMAGE. * * @(#)kern_lock.c 8.18 (Berkeley) 5/21/95 - * $Id: kern_lock.c,v 1.11 1997/08/22 07:16:46 phk Exp $ + * $Id: kern_lock.c,v 1.12 1997/09/21 04:22:52 dyson Exp $ */ #include <sys/param.h> @@ -46,10 +46,6 @@ #include <sys/lock.h> #include <sys/systm.h> -#ifdef SMP -#include <machine/smp.h> -#endif - /* * Locking primitives implementation. * Locks provide shared/exclusive sychronization. diff --git a/sys/kern/kern_module.c b/sys/kern/kern_module.c index 9f6a670..b6d1b90 100644 --- a/sys/kern/kern_module.c +++ b/sys/kern/kern_module.c @@ -23,13 +23,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: kern_module.c,v 1.2 1997/08/02 14:31:33 bde Exp $ + * $Id: kern_module.c,v 1.3 1997/10/24 05:29:07 jmg Exp $ */ #include <sys/param.h> #include <sys/kernel.h> #include <sys/systm.h> -#include <sys/queue.h> #include <sys/malloc.h> #include <sys/sysproto.h> #include <sys/sysent.h> diff --git a/sys/kern/kern_random.c b/sys/kern/kern_random.c index 70d3c95..3c4f9eb 100644 --- a/sys/kern/kern_random.c +++ b/sys/kern/kern_random.c @@ -1,7 +1,7 @@ /* * random_machdep.c -- A strong random number generator * - * $Id: random_machdep.c,v 1.17 1997/05/04 14:28:22 peter Exp $ + * $Id: random_machdep.c,v 1.18 1997/09/14 03:19:15 peter Exp $ * * Version 0.95, last modified 18-Oct-95 * @@ -39,14 +39,11 @@ * OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "opt_cpu.h" - #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/select.h> #include <sys/poll.h> -#include <sys/fcntl.h> #include <machine/clock.h> #include <machine/random.h> diff --git a/sys/kern/subr_log.c b/sys/kern/subr_log.c index 490c602..1faa3fc 100644 --- a/sys/kern/subr_log.c +++ b/sys/kern/subr_log.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)subr_log.c 8.1 (Berkeley) 6/10/93 - * $Id: subr_log.c,v 1.23 1997/09/14 02:46:44 peter Exp $ + * $Id: subr_log.c,v 1.24 1997/09/16 11:43:30 bde Exp $ */ /* @@ -46,7 +46,6 @@ #include <sys/filio.h> #include <sys/ttycom.h> #include <sys/msgbuf.h> -#include <sys/fcntl.h> #include <sys/signalvar.h> #include <sys/kernel.h> #include <sys/poll.h> diff --git a/sys/kern/subr_smp.c b/sys/kern/subr_smp.c index ad3841a..a31857a 100644 --- a/sys/kern/subr_smp.c +++ b/sys/kern/subr_smp.c @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: mp_machdep.c,v 1.57 1997/10/10 09:44:03 peter Exp $ + * $Id: mp_machdep.c,v 1.58 1997/10/12 15:24:39 peter Exp $ */ #include "opt_smp.h" @@ -47,7 +47,6 @@ #include <machine/smptests.h> /** TEST_DEFAULT_CONFIG, TEST_TEST1 */ #include <machine/tss.h> #include <machine/specialreg.h> -#include <machine/cpu.h> #include <machine/cputypes.h> #include <i386/i386/cons.h> /* cngetc() */ diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c index 484e208..2c3a1bf 100644 --- a/sys/kern/uipc_mbuf.c +++ b/sys/kern/uipc_mbuf.c @@ -31,12 +31,11 @@ * SUCH DAMAGE. * * @(#)uipc_mbuf.c 8.2 (Berkeley) 1/4/94 - * $Id: uipc_mbuf.c,v 1.30 1997/08/02 14:31:41 bde Exp $ + * $Id: uipc_mbuf.c,v 1.31 1997/10/12 20:24:10 phk Exp $ */ #include <sys/param.h> #include <sys/systm.h> -#include <sys/malloc.h> #include <sys/mbuf.h> #include <sys/kernel.h> #include <sys/sysctl.h> diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index 108ba71..bd1d78f 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -18,7 +18,7 @@ * 5. Modifications may be freely made to this file if the above conditions * are met. * - * $Id: vfs_bio.c,v 1.130 1997/10/12 20:24:21 phk Exp $ + * $Id: vfs_bio.c,v 1.131 1997/10/26 20:55:04 phk Exp $ */ /* @@ -56,9 +56,6 @@ #include <sys/mount.h> #include <sys/malloc.h> #include <sys/resourcevar.h> -#include <sys/proc.h> - -#include <miscfs/specfs/specdev.h> static MALLOC_DEFINE(M_BIOBUF, "BIO buffer", "BIO buffer"); diff --git a/sys/kern/vnode_if.pl b/sys/kern/vnode_if.pl index d351d8e..5f59985 100644 --- a/sys/kern/vnode_if.pl +++ b/sys/kern/vnode_if.pl @@ -32,7 +32,7 @@ # SUCH DAMAGE. # # @(#)vnode_if.sh 8.1 (Berkeley) 6/10/93 -# $Id: vnode_if.sh,v 1.11 1997/02/22 09:39:36 peter Exp $ +# $Id: vnode_if.sh,v 1.12 1997/09/10 20:11:02 phk Exp $ # # Script to produce VFS front-end sugar. @@ -185,7 +185,6 @@ cat << END_OF_LEADING_COMMENT > $CFILE */ #include <sys/param.h> -#include <sys/mount.h> #include <sys/vnode.h> struct vnodeop_desc vop_default_desc = { diff --git a/sys/kern/vnode_if.sh b/sys/kern/vnode_if.sh index d351d8e..5f59985 100644 --- a/sys/kern/vnode_if.sh +++ b/sys/kern/vnode_if.sh @@ -32,7 +32,7 @@ # SUCH DAMAGE. # # @(#)vnode_if.sh 8.1 (Berkeley) 6/10/93 -# $Id: vnode_if.sh,v 1.11 1997/02/22 09:39:36 peter Exp $ +# $Id: vnode_if.sh,v 1.12 1997/09/10 20:11:02 phk Exp $ # # Script to produce VFS front-end sugar. @@ -185,7 +185,6 @@ cat << END_OF_LEADING_COMMENT > $CFILE */ #include <sys/param.h> -#include <sys/mount.h> #include <sys/vnode.h> struct vnodeop_desc vop_default_desc = { diff --git a/sys/net/bsd_comp.c b/sys/net/bsd_comp.c index f2ba1f8..fde1f92 100644 --- a/sys/net/bsd_comp.c +++ b/sys/net/bsd_comp.c @@ -40,19 +40,14 @@ /* * This version is for use with mbufs on BSD-derived systems. * - * $Id: bsd_comp.c,v 1.8 1997/08/19 17:07:07 peter Exp $ + * $Id: bsd_comp.c,v 1.9 1997/09/02 01:18:31 bde Exp $ */ #include <sys/param.h> -#include <sys/types.h> #include <sys/systm.h> #include <sys/malloc.h> #include <sys/mbuf.h> -#include <sys/socket.h> -#include <net/if.h> -#include <net/if_types.h> #include <net/ppp_defs.h> -#include <net/if_ppp.h> #define PACKETPTR struct mbuf * #include <net/ppp_comp.h> diff --git a/sys/net/if.c b/sys/net/if.c index e68637e..61f951b 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -31,11 +31,10 @@ * SUCH DAMAGE. * * @(#)if.c 8.3 (Berkeley) 1/4/94 - * $Id: if.c,v 1.54 1997/10/07 07:40:35 joerg Exp $ + * $Id: if.c,v 1.55 1997/10/12 20:25:09 phk Exp $ */ #include <sys/param.h> -#include <sys/queue.h> #include <sys/malloc.h> #include <sys/mbuf.h> #include <sys/systm.h> @@ -45,13 +44,11 @@ #include <sys/protosw.h> #include <sys/kernel.h> #include <sys/sockio.h> -#include <sys/errno.h> #include <sys/syslog.h> #include <sys/sysctl.h> #include <net/if.h> #include <net/if_dl.h> -#include <net/if_types.h> #include <net/radix.h> /* diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c index 13be403..dd05686 100644 --- a/sys/net/if_ethersubr.c +++ b/sys/net/if_ethersubr.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)if_ethersubr.c 8.1 (Berkeley) 6/10/93 - * $Id: if_ethersubr.c,v 1.35 1997/05/10 10:01:31 jhay Exp $ + * $Id: if_ethersubr.c,v 1.36 1997/07/15 23:25:32 julian Exp $ */ #include <sys/param.h> @@ -39,11 +39,8 @@ #include <sys/kernel.h> #include <sys/malloc.h> #include <sys/mbuf.h> -#include <sys/protosw.h> #include <sys/socket.h> #include <sys/sockio.h> -#include <sys/errno.h> -#include <sys/syslog.h> #include <sys/sysctl.h> #include <net/if.h> @@ -52,7 +49,6 @@ #include <net/if_llc.h> #include <net/if_dl.h> #include <net/if_types.h> -#include <net/ethernet.h> #ifdef INET #include <netinet/in.h> diff --git a/sys/net/ppp_deflate.c b/sys/net/ppp_deflate.c index 09686c3..a3f8423 100644 --- a/sys/net/ppp_deflate.c +++ b/sys/net/ppp_deflate.c @@ -1,4 +1,4 @@ -/* $Id: ppp_deflate.c,v 1.4 1997/09/02 01:18:39 bde Exp $ */ +/* $Id: ppp_deflate.c,v 1.5 1997/09/21 22:31:20 dyson Exp $ */ /* * ppp_deflate.c - interface the zlib procedures for Deflate compression @@ -30,7 +30,6 @@ */ #include <sys/param.h> -#include <sys/types.h> #include <sys/systm.h> #include <sys/malloc.h> #include <sys/mbuf.h> diff --git a/sys/net/raw_cb.c b/sys/net/raw_cb.c index d89c417..8c27c2d 100644 --- a/sys/net/raw_cb.c +++ b/sys/net/raw_cb.c @@ -31,24 +31,17 @@ * SUCH DAMAGE. * * @(#)raw_cb.c 8.1 (Berkeley) 6/10/93 - * $Id: raw_cb.c,v 1.12 1997/04/27 20:00:58 wollman Exp $ + * $Id: raw_cb.c,v 1.13 1997/09/02 01:18:44 bde Exp $ */ #include <sys/param.h> -#include <sys/queue.h> -#include <sys/systm.h> #include <sys/malloc.h> -#include <sys/mbuf.h> #include <sys/socket.h> #include <sys/socketvar.h> #include <sys/domain.h> #include <sys/protosw.h> -#include <sys/errno.h> -#include <net/if.h> -#include <net/route.h> #include <net/raw_cb.h> -#include <netinet/in.h> /* * Routines to manage the raw protocol control blocks. diff --git a/sys/net/route.c b/sys/net/route.c index 3abe57c..85cf677 100644 --- a/sys/net/route.c +++ b/sys/net/route.c @@ -31,29 +31,22 @@ * SUCH DAMAGE. * * @(#)route.c 8.2 (Berkeley) 11/15/93 - * $Id: route.c,v 1.43 1997/09/02 01:18:46 bde Exp $ + * $Id: route.c,v 1.44 1997/09/16 11:43:46 bde Exp $ */ #include "opt_mrouting.h" #include <sys/param.h> -#include <sys/queue.h> #include <sys/systm.h> -#include <sys/kernel.h> -#include <sys/proc.h> #include <sys/malloc.h> #include <sys/mbuf.h> #include <sys/socket.h> -#include <sys/socketvar.h> #include <sys/domain.h> -#include <sys/protosw.h> #include <net/if.h> #include <net/route.h> -#include <net/raw_cb.h> #include <netinet/in.h> -#include <netinet/in_var.h> #include <netinet/ip_mroute.h> #define SA(p) ((struct sockaddr *)(p)) diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c index 12650ac..b6a46ea 100644 --- a/sys/net/rtsock.c +++ b/sys/net/rtsock.c @@ -31,12 +31,11 @@ * SUCH DAMAGE. * * @(#)rtsock.c 8.5 (Berkeley) 11/2/94 - * $Id: rtsock.c,v 1.34 1997/09/14 03:10:38 peter Exp $ + * $Id: rtsock.c,v 1.35 1997/10/12 20:25:15 phk Exp $ */ #include <sys/param.h> -#include <sys/queue.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/sysctl.h> diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c index c02abc0..5ae5ee3 100644 --- a/sys/netinet/if_ether.c +++ b/sys/netinet/if_ether.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)if_ether.c 8.1 (Berkeley) 6/10/93 - * $Id: if_ether.c,v 1.39 1997/02/22 09:41:24 peter Exp $ + * $Id: if_ether.c,v 1.40 1997/05/14 16:39:52 tegge Exp $ */ /* @@ -43,7 +43,6 @@ #include <sys/param.h> #include <sys/kernel.h> #include <sys/sysctl.h> -#include <sys/queue.h> #include <sys/systm.h> #include <sys/mbuf.h> #include <sys/malloc.h> diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 77ff62d..3aa28e9 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -31,19 +31,16 @@ * SUCH DAMAGE. * * @(#)in_pcb.c 8.4 (Berkeley) 5/24/95 - * $Id: in_pcb.c,v 1.33 1997/05/19 01:28:39 tegge Exp $ + * $Id: in_pcb.c,v 1.34 1997/08/16 19:15:36 wollman Exp $ */ #include <sys/param.h> -#include <sys/queue.h> #include <sys/systm.h> #include <sys/malloc.h> #include <sys/mbuf.h> #include <sys/protosw.h> #include <sys/socket.h> #include <sys/socketvar.h> -#include <sys/errno.h> -#include <sys/time.h> #include <sys/proc.h> #include <sys/kernel.h> #include <sys/sysctl.h> @@ -52,8 +49,6 @@ #include <net/route.h> #include <netinet/in.h> -#include <netinet/in_systm.h> -#include <netinet/ip.h> #include <netinet/in_pcb.h> #include <netinet/in_var.h> #include <netinet/ip_var.h> diff --git a/sys/netinet/in_proto.c b/sys/netinet/in_proto.c index fe70e37..9356624 100644 --- a/sys/netinet/in_proto.c +++ b/sys/netinet/in_proto.c @@ -31,23 +31,17 @@ * SUCH DAMAGE. * * @(#)in_proto.c 8.2 (Berkeley) 2/9/95 - * $Id: in_proto.c,v 1.41 1997/09/16 11:43:55 bde Exp $ + * $Id: in_proto.c,v 1.42 1997/09/16 18:36:04 joerg Exp $ */ -#include "opt_tcpdebug.h" - #include <sys/param.h> -#include <sys/queue.h> #include <sys/kernel.h> #include <sys/socket.h> -#include <sys/socketvar.h> #include <sys/domain.h> -#include <sys/mbuf.h> #include <sys/protosw.h> #include <sys/sysctl.h> #include <net/if.h> -#include <net/radix.h> #include <net/route.h> #include <netinet/in.h> @@ -55,17 +49,10 @@ #include <netinet/ip.h> #include <netinet/ip_var.h> #include <netinet/ip_icmp.h> -#include <netinet/in_pcb.h> #include <netinet/igmp_var.h> #include <netinet/tcp.h> -#include <netinet/tcp_fsm.h> -#include <netinet/tcp_seq.h> #include <netinet/tcp_timer.h> #include <netinet/tcp_var.h> -#include <netinet/tcpip.h> -#ifdef TCPDEBUG -#include <netinet/tcp_debug.h> -#endif #include <netinet/udp.h> #include <netinet/udp_var.h> /* @@ -73,7 +60,6 @@ */ #ifdef IPXIP -#include <netipx/ipx.h> #include <netipx/ipx_ip.h> #endif diff --git a/sys/netinet/ip_fw.h b/sys/netinet/ip_fw.h index 78f8c56..20e6f3d 100644 --- a/sys/netinet/ip_fw.h +++ b/sys/netinet/ip_fw.h @@ -11,14 +11,12 @@ * * This software is provided ``AS IS'' without any warranties of any kind. * - * $Id: ip_fw.h,v 1.28 1997/08/08 14:36:29 alex Exp $ + * $Id: ip_fw.h,v 1.29 1997/09/16 11:43:57 bde Exp $ */ #ifndef _IP_FW_H #define _IP_FW_H -#include <net/if.h> - /* * This union structure identifies an interface, either explicitly * by name or implicitly by IP address. The flags IP_FW_F_IIFNAME diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index 9bbe743..947207e 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ip_input.c 8.2 (Berkeley) 1/4/94 - * $Id: ip_input.c,v 1.66 1997/09/25 00:34:35 wollman Exp $ + * $Id: ip_input.c,v 1.67 1997/10/27 21:07:26 guido Exp $ * $ANA: ip_input.c,v 1.5 1996/09/18 14:34:59 wollman Exp $ */ @@ -43,12 +43,10 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/malloc.h> #include <sys/mbuf.h> #include <sys/domain.h> #include <sys/protosw.h> #include <sys/socket.h> -#include <sys/errno.h> #include <sys/time.h> #include <sys/kernel.h> #include <sys/syslog.h> @@ -64,7 +62,6 @@ #include <netinet/in_var.h> #include <netinet/ip.h> #include <netinet/in_pcb.h> -#include <netinet/in_var.h> #include <netinet/ip_var.h> #include <netinet/ip_icmp.h> #include <machine/in_cksum.h> diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c index 5412186..fa6809e 100644 --- a/sys/netinet/ip_mroute.c +++ b/sys/netinet/ip_mroute.c @@ -9,19 +9,17 @@ * Modified by Bill Fenner, PARC, April 1995 * * MROUTING Revision: 3.5 - * $Id: ip_mroute.c,v 1.40 1997/07/19 20:07:07 fenner Exp $ + * $Id: ip_mroute.c,v 1.41 1997/09/21 22:01:38 gibbs Exp $ */ #include "opt_mrouting.h" #include <sys/param.h> -#include <sys/queue.h> #include <sys/systm.h> #include <sys/mbuf.h> #include <sys/socket.h> #include <sys/socketvar.h> #include <sys/protosw.h> -#include <sys/errno.h> #include <sys/time.h> #include <sys/kernel.h> #include <sys/sockio.h> @@ -32,10 +30,8 @@ #include <netinet/in_systm.h> #include <netinet/ip.h> #include <netinet/ip_var.h> -#include <netinet/in_pcb.h> #include <netinet/in_var.h> #include <netinet/igmp.h> -#include <netinet/igmp_var.h> #include <netinet/ip_mroute.h> #include <netinet/udp.h> diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 073c1a6..d87482c 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -31,14 +31,13 @@ * SUCH DAMAGE. * * @(#)tcp_input.c 8.12 (Berkeley) 5/24/95 - * $Id: tcp_input.c,v 1.62 1997/09/30 16:38:09 fenner Exp $ + * $Id: tcp_input.c,v 1.63 1997/10/02 02:10:40 davidg Exp $ */ #include "opt_tcpdebug.h" #ifndef TUBA_INCLUDE #include <sys/param.h> -#include <sys/queue.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/sysctl.h> @@ -48,7 +47,6 @@ #include <sys/protosw.h> #include <sys/socket.h> #include <sys/socketvar.h> -#include <sys/errno.h> #include <sys/syslog.h> #include <machine/cpu.h> /* before tcp_seq.h, for tcp_random18() */ diff --git a/sys/netinet/tcp_reass.c b/sys/netinet/tcp_reass.c index 073c1a6..d87482c 100644 --- a/sys/netinet/tcp_reass.c +++ b/sys/netinet/tcp_reass.c @@ -31,14 +31,13 @@ * SUCH DAMAGE. * * @(#)tcp_input.c 8.12 (Berkeley) 5/24/95 - * $Id: tcp_input.c,v 1.62 1997/09/30 16:38:09 fenner Exp $ + * $Id: tcp_input.c,v 1.63 1997/10/02 02:10:40 davidg Exp $ */ #include "opt_tcpdebug.h" #ifndef TUBA_INCLUDE #include <sys/param.h> -#include <sys/queue.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/sysctl.h> @@ -48,7 +47,6 @@ #include <sys/protosw.h> #include <sys/socket.h> #include <sys/socketvar.h> -#include <sys/errno.h> #include <sys/syslog.h> #include <machine/cpu.h> /* before tcp_seq.h, for tcp_random18() */ diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index b13f274..23d8a0b 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -31,14 +31,12 @@ * SUCH DAMAGE. * * @(#)tcp_subr.c 8.2 (Berkeley) 5/24/95 - * $Id: tcp_subr.c,v 1.37 1997/09/16 11:43:59 bde Exp $ + * $Id: tcp_subr.c,v 1.38 1997/09/16 18:36:06 joerg Exp $ */ #include "opt_tcpdebug.h" #include <sys/param.h> -#include <sys/queue.h> -#include <sys/proc.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/sysctl.h> @@ -47,7 +45,6 @@ #include <sys/socket.h> #include <sys/socketvar.h> #include <sys/protosw.h> -#include <sys/errno.h> #include <net/route.h> #include <net/if.h> @@ -59,7 +56,6 @@ #include <netinet/in_pcb.h> #include <netinet/in_var.h> #include <netinet/ip_var.h> -#include <netinet/ip_icmp.h> #include <netinet/tcp.h> #include <netinet/tcp_fsm.h> #include <netinet/tcp_seq.h> diff --git a/sys/netinet/tcp_timewait.c b/sys/netinet/tcp_timewait.c index b13f274..23d8a0b 100644 --- a/sys/netinet/tcp_timewait.c +++ b/sys/netinet/tcp_timewait.c @@ -31,14 +31,12 @@ * SUCH DAMAGE. * * @(#)tcp_subr.c 8.2 (Berkeley) 5/24/95 - * $Id: tcp_subr.c,v 1.37 1997/09/16 11:43:59 bde Exp $ + * $Id: tcp_subr.c,v 1.38 1997/09/16 18:36:06 joerg Exp $ */ #include "opt_tcpdebug.h" #include <sys/param.h> -#include <sys/queue.h> -#include <sys/proc.h> #include <sys/systm.h> #include <sys/kernel.h> #include <sys/sysctl.h> @@ -47,7 +45,6 @@ #include <sys/socket.h> #include <sys/socketvar.h> #include <sys/protosw.h> -#include <sys/errno.h> #include <net/route.h> #include <net/if.h> @@ -59,7 +56,6 @@ #include <netinet/in_pcb.h> #include <netinet/in_var.h> #include <netinet/ip_var.h> -#include <netinet/ip_icmp.h> #include <netinet/tcp.h> #include <netinet/tcp_fsm.h> #include <netinet/tcp_seq.h> diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index b666613..036bb4e 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -31,20 +31,17 @@ * SUCH DAMAGE. * * @(#)udp_usrreq.c 8.6 (Berkeley) 5/23/95 - * $Id: udp_usrreq.c,v 1.39 1997/08/16 19:15:41 wollman Exp $ + * $Id: udp_usrreq.c,v 1.40 1997/09/14 03:10:40 peter Exp $ */ #include <sys/param.h> -#include <sys/queue.h> #include <sys/systm.h> -#include <sys/errno.h> #include <sys/kernel.h> #include <sys/malloc.h> #include <sys/mbuf.h> #include <sys/protosw.h> #include <sys/socket.h> #include <sys/socketvar.h> -#include <sys/stat.h> #include <sys/sysctl.h> #include <sys/syslog.h> diff --git a/sys/netipx/ipx_pcb.c b/sys/netipx/ipx_pcb.c index 78d879d..e375f3b 100644 --- a/sys/netipx/ipx_pcb.c +++ b/sys/netipx/ipx_pcb.c @@ -33,13 +33,12 @@ * * @(#)ipx_pcb.c * - * $Id: ipx_pcb.c,v 1.11 1997/08/16 19:15:44 wollman Exp $ + * $Id: ipx_pcb.c,v 1.12 1997/09/02 01:19:10 bde Exp $ */ #include <sys/param.h> #include <sys/systm.h> #include <sys/malloc.h> -#include <sys/mbuf.h> #include <sys/proc.h> #include <sys/socket.h> #include <sys/socketvar.h> diff --git a/sys/netnatm/natm.c b/sys/netnatm/natm.c index 1462402..877ed62 100644 --- a/sys/netnatm/natm.c +++ b/sys/netnatm/natm.c @@ -39,13 +39,7 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> -#include <sys/domain.h> -#if defined(__FreeBSD__) #include <sys/sockio.h> -#else -#include <sys/ioctl.h> -#endif -#include <sys/proc.h> #include <sys/protosw.h> #include <sys/malloc.h> #include <sys/mbuf.h> @@ -55,8 +49,6 @@ #include <net/if.h> #include <net/if_atm.h> #include <net/netisr.h> -#include <net/radix.h> -#include <net/route.h> #include <netinet/in.h> diff --git a/sys/nfs/bootp_subr.c b/sys/nfs/bootp_subr.c index b1fd716..a1e909d 100644 --- a/sys/nfs/bootp_subr.c +++ b/sys/nfs/bootp_subr.c @@ -1,4 +1,4 @@ -/* $Id: bootp_subr.c,v 1.4 1997/06/12 14:08:20 tegge Exp $ */ +/* $Id: bootp_subr.c,v 1.5 1997/08/16 19:15:51 wollman Exp $ */ /* * Copyright (c) 1995 Gordon Ross, Adam Glass @@ -45,12 +45,10 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> -#include <sys/conf.h> #include <sys/sockio.h> #include <sys/proc.h> #include <sys/mount.h> #include <sys/mbuf.h> -#include <sys/reboot.h> #include <sys/socket.h> #include <sys/socketvar.h> @@ -60,7 +58,6 @@ #include <netinet/in.h> #include <net/if_types.h> #include <net/if_dl.h> -#include <netinet/if_ether.h> #include <nfs/rpcv2.h> #include <nfs/nfsproto.h> diff --git a/sys/nfs/krpc_subr.c b/sys/nfs/krpc_subr.c index 6801b93..63aea3b 100644 --- a/sys/nfs/krpc_subr.c +++ b/sys/nfs/krpc_subr.c @@ -1,5 +1,5 @@ /* $NetBSD: krpc_subr.c,v 1.12.4.1 1996/06/07 00:52:26 cgd Exp $ */ -/* $Id: krpc_subr.c,v 1.5 1997/09/02 01:19:26 bde Exp $ */ +/* $Id: krpc_subr.c,v 1.6 1997/10/12 20:25:36 phk Exp $ */ /* * Copyright (c) 1995 Gordon Ross, Adam Glass @@ -45,13 +45,8 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/conf.h> -#include <sys/sockio.h> -#include <sys/proc.h> #include <sys/malloc.h> -#include <sys/mount.h> #include <sys/mbuf.h> -#include <sys/reboot.h> #include <sys/socket.h> #include <sys/socketvar.h> diff --git a/sys/nfs/nfs_common.c b/sys/nfs/nfs_common.c index 11b33bd..a482b58 100644 --- a/sys/nfs/nfs_common.c +++ b/sys/nfs/nfs_common.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_subs.c 8.3 (Berkeley) 1/4/94 - * $Id: nfs_subs.c,v 1.44 1997/10/26 20:13:52 phk Exp $ + * $Id: nfs_subs.c,v 1.45 1997/10/28 14:06:22 bde Exp $ */ /* @@ -53,15 +53,12 @@ #include <sys/socket.h> #include <sys/stat.h> #include <sys/malloc.h> -#include <sys/dirent.h> #include <sys/sysent.h> #include <sys/syscall.h> #include <vm/vm.h> -#include <vm/vm_param.h> #include <vm/vm_object.h> #include <vm/vm_extern.h> -#include <vm/vnode_pager.h> #include <nfs/rpcv2.h> #include <nfs/nfsproto.h> diff --git a/sys/nfs/nfs_nqlease.c b/sys/nfs/nfs_nqlease.c index 98b2db0..ce2a34e 100644 --- a/sys/nfs/nfs_nqlease.c +++ b/sys/nfs/nfs_nqlease.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_nqlease.c 8.9 (Berkeley) 5/20/95 - * $Id: nfs_nqlease.c,v 1.29 1997/10/11 18:31:34 phk Exp $ + * $Id: nfs_nqlease.c,v 1.30 1997/10/12 20:25:41 phk Exp $ */ @@ -61,9 +61,6 @@ #include <sys/mbuf.h> #include <sys/socket.h> #include <sys/socketvar.h> -#include <sys/file.h> -#include <sys/buf.h> -#include <sys/stat.h> #include <sys/protosw.h> #include <netinet/in.h> diff --git a/sys/nfs/nfs_serv.c b/sys/nfs/nfs_serv.c index d275143..0cbfa9b 100644 --- a/sys/nfs/nfs_serv.c +++ b/sys/nfs/nfs_serv.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_serv.c 8.3 (Berkeley) 1/12/94 - * $Id: nfs_serv.c,v 1.50 1997/09/10 20:22:28 phk Exp $ + * $Id: nfs_serv.c,v 1.51 1997/09/21 04:23:49 dyson Exp $ */ /* @@ -74,8 +74,6 @@ #include <sys/sysctl.h> #include <vm/vm.h> -#include <vm/vm_param.h> -#include <vm/vm_object.h> #include <vm/vm_extern.h> #include <nfs/nfsproto.h> diff --git a/sys/nfs/nfs_socket.c b/sys/nfs/nfs_socket.c index 55ee3ed..ed23c69 100644 --- a/sys/nfs/nfs_socket.c +++ b/sys/nfs/nfs_socket.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_socket.c 8.5 (Berkeley) 3/30/95 - * $Id: nfs_socket.c,v 1.28 1997/09/02 01:19:37 bde Exp $ + * $Id: nfs_socket.c,v 1.29 1997/10/12 20:25:44 phk Exp $ */ /* @@ -49,7 +49,6 @@ #include <sys/kernel.h> #include <sys/mbuf.h> #include <sys/vnode.h> -#include <sys/domain.h> #include <sys/protosw.h> #include <sys/socket.h> #include <sys/socketvar.h> diff --git a/sys/nfs/nfs_subs.c b/sys/nfs/nfs_subs.c index 11b33bd..a482b58 100644 --- a/sys/nfs/nfs_subs.c +++ b/sys/nfs/nfs_subs.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_subs.c 8.3 (Berkeley) 1/4/94 - * $Id: nfs_subs.c,v 1.44 1997/10/26 20:13:52 phk Exp $ + * $Id: nfs_subs.c,v 1.45 1997/10/28 14:06:22 bde Exp $ */ /* @@ -53,15 +53,12 @@ #include <sys/socket.h> #include <sys/stat.h> #include <sys/malloc.h> -#include <sys/dirent.h> #include <sys/sysent.h> #include <sys/syscall.h> #include <vm/vm.h> -#include <vm/vm_param.h> #include <vm/vm_object.h> #include <vm/vm_extern.h> -#include <vm/vnode_pager.h> #include <nfs/rpcv2.h> #include <nfs/nfsproto.h> diff --git a/sys/nfs/nfs_syscalls.c b/sys/nfs/nfs_syscalls.c index fcf1745..80f2298 100644 --- a/sys/nfs/nfs_syscalls.c +++ b/sys/nfs/nfs_syscalls.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_syscalls.c 8.5 (Berkeley) 3/30/95 - * $Id: nfs_syscalls.c,v 1.28 1997/10/11 18:31:35 phk Exp $ + * $Id: nfs_syscalls.c,v 1.29 1997/10/12 20:25:47 phk Exp $ */ #include <sys/param.h> @@ -44,12 +44,10 @@ #include <sys/sysctl.h> #include <sys/file.h> #include <sys/filedesc.h> -#include <sys/stat.h> #include <sys/vnode.h> #include <sys/malloc.h> #include <sys/mount.h> #include <sys/proc.h> -#include <sys/uio.h> #include <sys/buf.h> #include <sys/mbuf.h> #include <sys/socket.h> @@ -57,7 +55,6 @@ #include <sys/domain.h> #include <sys/protosw.h> #include <sys/namei.h> -#include <sys/syslog.h> #include <netinet/in.h> #include <netinet/tcp.h> diff --git a/sys/nfs/nfs_vfsops.c b/sys/nfs/nfs_vfsops.c index ca44905..de9babf 100644 --- a/sys/nfs/nfs_vfsops.c +++ b/sys/nfs/nfs_vfsops.c @@ -34,28 +34,23 @@ * SUCH DAMAGE. * * @(#)nfs_vfsops.c 8.12 (Berkeley) 5/20/95 - * $Id: nfs_vfsops.c,v 1.49 1997/10/12 20:25:49 phk Exp $ + * $Id: nfs_vfsops.c,v 1.50 1997/10/28 14:06:23 bde Exp $ */ #include <sys/param.h> -#include <sys/conf.h> #include <sys/sockio.h> -#include <sys/signal.h> #include <sys/proc.h> -#include <sys/namei.h> #include <sys/vnode.h> #include <sys/kernel.h> #include <sys/sysctl.h> #include <sys/malloc.h> #include <sys/mount.h> -#include <sys/buf.h> #include <sys/mbuf.h> #include <sys/socket.h> #include <sys/socketvar.h> #include <sys/systm.h> #include <vm/vm.h> -#include <vm/vm_param.h> #include <vm/vm_extern.h> #include <net/if.h> diff --git a/sys/nfsclient/bootp_subr.c b/sys/nfsclient/bootp_subr.c index b1fd716..a1e909d 100644 --- a/sys/nfsclient/bootp_subr.c +++ b/sys/nfsclient/bootp_subr.c @@ -1,4 +1,4 @@ -/* $Id: bootp_subr.c,v 1.4 1997/06/12 14:08:20 tegge Exp $ */ +/* $Id: bootp_subr.c,v 1.5 1997/08/16 19:15:51 wollman Exp $ */ /* * Copyright (c) 1995 Gordon Ross, Adam Glass @@ -45,12 +45,10 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> -#include <sys/conf.h> #include <sys/sockio.h> #include <sys/proc.h> #include <sys/mount.h> #include <sys/mbuf.h> -#include <sys/reboot.h> #include <sys/socket.h> #include <sys/socketvar.h> @@ -60,7 +58,6 @@ #include <netinet/in.h> #include <net/if_types.h> #include <net/if_dl.h> -#include <netinet/if_ether.h> #include <nfs/rpcv2.h> #include <nfs/nfsproto.h> diff --git a/sys/nfsclient/krpc_subr.c b/sys/nfsclient/krpc_subr.c index 6801b93..63aea3b 100644 --- a/sys/nfsclient/krpc_subr.c +++ b/sys/nfsclient/krpc_subr.c @@ -1,5 +1,5 @@ /* $NetBSD: krpc_subr.c,v 1.12.4.1 1996/06/07 00:52:26 cgd Exp $ */ -/* $Id: krpc_subr.c,v 1.5 1997/09/02 01:19:26 bde Exp $ */ +/* $Id: krpc_subr.c,v 1.6 1997/10/12 20:25:36 phk Exp $ */ /* * Copyright (c) 1995 Gordon Ross, Adam Glass @@ -45,13 +45,8 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/conf.h> -#include <sys/sockio.h> -#include <sys/proc.h> #include <sys/malloc.h> -#include <sys/mount.h> #include <sys/mbuf.h> -#include <sys/reboot.h> #include <sys/socket.h> #include <sys/socketvar.h> diff --git a/sys/nfsclient/nfs_nfsiod.c b/sys/nfsclient/nfs_nfsiod.c index fcf1745..80f2298 100644 --- a/sys/nfsclient/nfs_nfsiod.c +++ b/sys/nfsclient/nfs_nfsiod.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_syscalls.c 8.5 (Berkeley) 3/30/95 - * $Id: nfs_syscalls.c,v 1.28 1997/10/11 18:31:35 phk Exp $ + * $Id: nfs_syscalls.c,v 1.29 1997/10/12 20:25:47 phk Exp $ */ #include <sys/param.h> @@ -44,12 +44,10 @@ #include <sys/sysctl.h> #include <sys/file.h> #include <sys/filedesc.h> -#include <sys/stat.h> #include <sys/vnode.h> #include <sys/malloc.h> #include <sys/mount.h> #include <sys/proc.h> -#include <sys/uio.h> #include <sys/buf.h> #include <sys/mbuf.h> #include <sys/socket.h> @@ -57,7 +55,6 @@ #include <sys/domain.h> #include <sys/protosw.h> #include <sys/namei.h> -#include <sys/syslog.h> #include <netinet/in.h> #include <netinet/tcp.h> diff --git a/sys/nfsclient/nfs_socket.c b/sys/nfsclient/nfs_socket.c index 55ee3ed..ed23c69 100644 --- a/sys/nfsclient/nfs_socket.c +++ b/sys/nfsclient/nfs_socket.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_socket.c 8.5 (Berkeley) 3/30/95 - * $Id: nfs_socket.c,v 1.28 1997/09/02 01:19:37 bde Exp $ + * $Id: nfs_socket.c,v 1.29 1997/10/12 20:25:44 phk Exp $ */ /* @@ -49,7 +49,6 @@ #include <sys/kernel.h> #include <sys/mbuf.h> #include <sys/vnode.h> -#include <sys/domain.h> #include <sys/protosw.h> #include <sys/socket.h> #include <sys/socketvar.h> diff --git a/sys/nfsclient/nfs_subs.c b/sys/nfsclient/nfs_subs.c index 11b33bd..a482b58 100644 --- a/sys/nfsclient/nfs_subs.c +++ b/sys/nfsclient/nfs_subs.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_subs.c 8.3 (Berkeley) 1/4/94 - * $Id: nfs_subs.c,v 1.44 1997/10/26 20:13:52 phk Exp $ + * $Id: nfs_subs.c,v 1.45 1997/10/28 14:06:22 bde Exp $ */ /* @@ -53,15 +53,12 @@ #include <sys/socket.h> #include <sys/stat.h> #include <sys/malloc.h> -#include <sys/dirent.h> #include <sys/sysent.h> #include <sys/syscall.h> #include <vm/vm.h> -#include <vm/vm_param.h> #include <vm/vm_object.h> #include <vm/vm_extern.h> -#include <vm/vnode_pager.h> #include <nfs/rpcv2.h> #include <nfs/nfsproto.h> diff --git a/sys/nfsclient/nfs_vfsops.c b/sys/nfsclient/nfs_vfsops.c index ca44905..de9babf 100644 --- a/sys/nfsclient/nfs_vfsops.c +++ b/sys/nfsclient/nfs_vfsops.c @@ -34,28 +34,23 @@ * SUCH DAMAGE. * * @(#)nfs_vfsops.c 8.12 (Berkeley) 5/20/95 - * $Id: nfs_vfsops.c,v 1.49 1997/10/12 20:25:49 phk Exp $ + * $Id: nfs_vfsops.c,v 1.50 1997/10/28 14:06:23 bde Exp $ */ #include <sys/param.h> -#include <sys/conf.h> #include <sys/sockio.h> -#include <sys/signal.h> #include <sys/proc.h> -#include <sys/namei.h> #include <sys/vnode.h> #include <sys/kernel.h> #include <sys/sysctl.h> #include <sys/malloc.h> #include <sys/mount.h> -#include <sys/buf.h> #include <sys/mbuf.h> #include <sys/socket.h> #include <sys/socketvar.h> #include <sys/systm.h> #include <vm/vm.h> -#include <vm/vm_param.h> #include <vm/vm_extern.h> #include <net/if.h> diff --git a/sys/nfsserver/nfs_serv.c b/sys/nfsserver/nfs_serv.c index d275143..0cbfa9b 100644 --- a/sys/nfsserver/nfs_serv.c +++ b/sys/nfsserver/nfs_serv.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_serv.c 8.3 (Berkeley) 1/12/94 - * $Id: nfs_serv.c,v 1.50 1997/09/10 20:22:28 phk Exp $ + * $Id: nfs_serv.c,v 1.51 1997/09/21 04:23:49 dyson Exp $ */ /* @@ -74,8 +74,6 @@ #include <sys/sysctl.h> #include <vm/vm.h> -#include <vm/vm_param.h> -#include <vm/vm_object.h> #include <vm/vm_extern.h> #include <nfs/nfsproto.h> diff --git a/sys/nfsserver/nfs_srvsock.c b/sys/nfsserver/nfs_srvsock.c index 55ee3ed..ed23c69 100644 --- a/sys/nfsserver/nfs_srvsock.c +++ b/sys/nfsserver/nfs_srvsock.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_socket.c 8.5 (Berkeley) 3/30/95 - * $Id: nfs_socket.c,v 1.28 1997/09/02 01:19:37 bde Exp $ + * $Id: nfs_socket.c,v 1.29 1997/10/12 20:25:44 phk Exp $ */ /* @@ -49,7 +49,6 @@ #include <sys/kernel.h> #include <sys/mbuf.h> #include <sys/vnode.h> -#include <sys/domain.h> #include <sys/protosw.h> #include <sys/socket.h> #include <sys/socketvar.h> diff --git a/sys/nfsserver/nfs_srvsubs.c b/sys/nfsserver/nfs_srvsubs.c index 11b33bd..a482b58 100644 --- a/sys/nfsserver/nfs_srvsubs.c +++ b/sys/nfsserver/nfs_srvsubs.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_subs.c 8.3 (Berkeley) 1/4/94 - * $Id: nfs_subs.c,v 1.44 1997/10/26 20:13:52 phk Exp $ + * $Id: nfs_subs.c,v 1.45 1997/10/28 14:06:22 bde Exp $ */ /* @@ -53,15 +53,12 @@ #include <sys/socket.h> #include <sys/stat.h> #include <sys/malloc.h> -#include <sys/dirent.h> #include <sys/sysent.h> #include <sys/syscall.h> #include <vm/vm.h> -#include <vm/vm_param.h> #include <vm/vm_object.h> #include <vm/vm_extern.h> -#include <vm/vnode_pager.h> #include <nfs/rpcv2.h> #include <nfs/nfsproto.h> diff --git a/sys/nfsserver/nfs_syscalls.c b/sys/nfsserver/nfs_syscalls.c index fcf1745..80f2298 100644 --- a/sys/nfsserver/nfs_syscalls.c +++ b/sys/nfsserver/nfs_syscalls.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_syscalls.c 8.5 (Berkeley) 3/30/95 - * $Id: nfs_syscalls.c,v 1.28 1997/10/11 18:31:35 phk Exp $ + * $Id: nfs_syscalls.c,v 1.29 1997/10/12 20:25:47 phk Exp $ */ #include <sys/param.h> @@ -44,12 +44,10 @@ #include <sys/sysctl.h> #include <sys/file.h> #include <sys/filedesc.h> -#include <sys/stat.h> #include <sys/vnode.h> #include <sys/malloc.h> #include <sys/mount.h> #include <sys/proc.h> -#include <sys/uio.h> #include <sys/buf.h> #include <sys/mbuf.h> #include <sys/socket.h> @@ -57,7 +55,6 @@ #include <sys/domain.h> #include <sys/protosw.h> #include <sys/namei.h> -#include <sys/syslog.h> #include <netinet/in.h> #include <netinet/tcp.h> diff --git a/sys/pci/if_en_pci.c b/sys/pci/if_en_pci.c index bebff3f..d1853b5 100644 --- a/sys/pci/if_en_pci.c +++ b/sys/pci/if_en_pci.c @@ -48,7 +48,6 @@ #if (NEN > 0) && (NPCI > 0) #include <sys/param.h> -#include <sys/types.h> #include <sys/kernel.h> #include <sys/systm.h> #ifndef SHUTDOWN_PRE_SYNC @@ -63,11 +62,8 @@ #include <sys/devconf.h> #endif #include <sys/malloc.h> -#include <sys/mbuf.h> #include <sys/socket.h> -#include <sys/socketvar.h> -#include <machine/cpufunc.h> /* for rdtsc proto for clock.h below */ #include <machine/clock.h> /* for DELAY */ #include <net/if.h> diff --git a/sys/pci/if_fxp.c b/sys/pci/if_fxp.c index 43f03bc..ef3284f 100644 --- a/sys/pci/if_fxp.c +++ b/sys/pci/if_fxp.c @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: if_fxp.c,v 1.44 1997/10/17 06:27:44 davidg Exp $ + * $Id: if_fxp.c,v 1.45 1997/10/23 01:45:15 davidg Exp $ */ /* @@ -42,7 +42,6 @@ #include <sys/malloc.h> #include <sys/kernel.h> #include <sys/socket.h> -#include <sys/syslog.h> #include <net/if.h> #include <net/if_dl.h> diff --git a/sys/tools/vnode_if.awk b/sys/tools/vnode_if.awk index d351d8e..5f59985 100644 --- a/sys/tools/vnode_if.awk +++ b/sys/tools/vnode_if.awk @@ -32,7 +32,7 @@ # SUCH DAMAGE. # # @(#)vnode_if.sh 8.1 (Berkeley) 6/10/93 -# $Id: vnode_if.sh,v 1.11 1997/02/22 09:39:36 peter Exp $ +# $Id: vnode_if.sh,v 1.12 1997/09/10 20:11:02 phk Exp $ # # Script to produce VFS front-end sugar. @@ -185,7 +185,6 @@ cat << END_OF_LEADING_COMMENT > $CFILE */ #include <sys/param.h> -#include <sys/mount.h> #include <sys/vnode.h> struct vnodeop_desc vop_default_desc = { diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index 61f2379..e87c056 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: vm_map.c,v 1.93 1997/10/12 20:26:30 phk Exp $ + * $Id: vm_map.c,v 1.94 1997/10/24 23:41:00 dyson Exp $ */ /* @@ -75,10 +75,6 @@ #include <sys/vmmeter.h> #include <sys/mman.h> -#ifdef SMP -#include <machine/smp.h> -#endif - #include <vm/vm.h> #include <vm/vm_param.h> #include <vm/vm_prot.h> |
