From c04a1143f03580a9c9140eb8961b96a607ac345b Mon Sep 17 00:00:00 2001
From: uch <uch@NetBSD.org>
Date: Sat, 15 Sep 2001 14:08:15 +0000
Subject: [PATCH] remove unneeded #include

---
 sys/arch/hpcmips/hpcmips/autoconf.c  | 25 ++++----------
 sys/arch/hpcmips/hpcmips/bus_dma.c   |  7 ++--
 sys/arch/hpcmips/hpcmips/bus_space.c |  6 ++--
 sys/arch/hpcmips/hpcmips/clock.c     |  8 ++---
 sys/arch/hpcmips/hpcmips/conf.c      |  5 +--
 sys/arch/hpcmips/hpcmips/cpu.c       | 11 +++---
 sys/arch/hpcmips/hpcmips/interrupt.c |  7 ++--
 sys/arch/hpcmips/hpcmips/machdep.c   | 50 +++++++++-------------------
 sys/arch/hpcmips/hpcmips/mainbus.c   |  3 +-
 9 files changed, 38 insertions(+), 84 deletions(-)

diff --git a/sys/arch/hpcmips/hpcmips/autoconf.c b/sys/arch/hpcmips/hpcmips/autoconf.c
index ec3568eb49e2..b7638d11153f 100644
--- a/sys/arch/hpcmips/hpcmips/autoconf.c
+++ b/sys/arch/hpcmips/hpcmips/autoconf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.9 2001/09/15 11:13:20 uch Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.10 2001/09/15 14:08:15 uch Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -43,31 +43,25 @@
  */
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.9 2001/09/15 11:13:20 uch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.10 2001/09/15 14:08:15 uch Exp $");
 
 /*
  * Setup the system to run on the current machine.
  *
- * Configure() is called at boot time.  Available
+ * cpu_configure() is called at boot time.  Available
  * devices are determined (from possibilities mentioned in ioconf.c),
  * and the drivers are initialized.
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/map.h>
-#include <sys/buf.h>
-#include <sys/dkstat.h>
 #include <sys/conf.h>
-#include <sys/disklabel.h>
-#include <sys/reboot.h>
-#include <sys/device.h>
 
-#include <machine/cpu.h>
 #include <machine/bus.h>
-#include <machine/autoconf.h>
-#include <machine/sysconf.h>
+#include <machine/disklabel.h>
 
+#include <machine/sysconf.h>
+#include <machine/autoconf.h>
 #include <machine/config_hook.h>
 
 int cpuspeed = 7;	/* approx # instr per usec. */
@@ -78,13 +72,6 @@ int booted_partition;
 static char booted_device_name[16];
 static void get_device(char *);
 
-/*
- * Determine mass storage and memory configuration for a machine.
- * Print cpu type, and then iterate over an array of devices
- * found on the baseboard or in turbochannel option slots.
- * Once devices are configured, enable interrupts, and probe
- * for attached scsi devices.
- */
 void
 cpu_configure()
 {
diff --git a/sys/arch/hpcmips/hpcmips/bus_dma.c b/sys/arch/hpcmips/hpcmips/bus_dma.c
index e539ece7839f..e890f33b0a43 100644
--- a/sys/arch/hpcmips/hpcmips/bus_dma.c
+++ b/sys/arch/hpcmips/hpcmips/bus_dma.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: bus_dma.c,v 1.10 2001/09/15 11:13:20 uch Exp $	*/
+/*	$NetBSD: bus_dma.c,v 1.11 2001/09/15 14:08:15 uch Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -46,9 +46,8 @@
 #define _HPCMIPS_BUS_DMA_PRIVATE
 #include <machine/bus.h>
 
-static int _bus_dmamap_load_buffer(bus_dmamap_t,
-    void *, bus_size_t, struct proc *, int, vaddr_t *,
-    int *, int);
+static int _bus_dmamap_load_buffer(bus_dmamap_t, void *, bus_size_t,
+    struct proc *, int, vaddr_t *, int *, int);
 
 paddr_t	kvtophys(vaddr_t);	/* XXX */
 
diff --git a/sys/arch/hpcmips/hpcmips/bus_space.c b/sys/arch/hpcmips/hpcmips/bus_space.c
index d093d16dac0d..a1eff3ef3752 100644
--- a/sys/arch/hpcmips/hpcmips/bus_space.c
+++ b/sys/arch/hpcmips/hpcmips/bus_space.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: bus_space.c,v 1.10 2001/09/15 11:13:20 uch Exp $	*/
+/*	$NetBSD: bus_space.c,v 1.11 2001/09/15 14:08:15 uch Exp $	*/
 
 /*
  * Copyright (c) 1999, by UCHIYAMA Yasushi
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  */
-/*	$NetBSD: bus_space.c,v 1.10 2001/09/15 11:13:20 uch Exp $	*/
+/*	$NetBSD: bus_space.c,v 1.11 2001/09/15 14:08:15 uch Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -67,12 +67,10 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
-#include <sys/map.h>
 #include <sys/extent.h>
 
 #include <uvm/uvm_extern.h>
 
-#include <mips/cpuregs.h>
 #include <mips/pte.h>
 #include <machine/bus.h>
 
diff --git a/sys/arch/hpcmips/hpcmips/clock.c b/sys/arch/hpcmips/hpcmips/clock.c
index 4bd015bdb016..6a2f763151e2 100644
--- a/sys/arch/hpcmips/hpcmips/clock.c
+++ b/sys/arch/hpcmips/hpcmips/clock.c
@@ -1,4 +1,4 @@
-/* $NetBSD: clock.c,v 1.12 2001/09/15 11:13:20 uch Exp $ */
+/* $NetBSD: clock.c,v 1.13 2001/09/15 14:08:15 uch Exp $ */
 
 /*-
  * Copyright (c) 1999 Shin Takemura, All rights reserved.
@@ -75,13 +75,11 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.12 2001/09/15 11:13:20 uch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.13 2001/09/15 14:08:15 uch Exp $");
 
 #include <sys/param.h>
-#include <sys/kernel.h>
 #include <sys/systm.h>
-#include <sys/device.h>
-#include <sys/sched.h>
+#include <sys/kernel.h>
 
 #include <dev/clock_subr.h>
 #include <machine/clock_machdep.h>
diff --git a/sys/arch/hpcmips/hpcmips/conf.c b/sys/arch/hpcmips/hpcmips/conf.c
index 1555eb44c1eb..e7342f5200ca 100644
--- a/sys/arch/hpcmips/hpcmips/conf.c
+++ b/sys/arch/hpcmips/hpcmips/conf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: conf.c,v 1.13 2001/09/15 11:13:20 uch Exp $	*/
+/*	$NetBSD: conf.c,v 1.14 2001/09/15 14:08:15 uch Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -39,9 +39,6 @@
  */
 
 #include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/buf.h>
-#include <sys/ioctl.h>
 #include <sys/tty.h>
 #include <sys/conf.h>
 #include <sys/vnode.h>
diff --git a/sys/arch/hpcmips/hpcmips/cpu.c b/sys/arch/hpcmips/hpcmips/cpu.c
index d982d30e2fa4..c567a8a4b6c8 100644
--- a/sys/arch/hpcmips/hpcmips/cpu.c
+++ b/sys/arch/hpcmips/hpcmips/cpu.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.c,v 1.8 2001/09/15 11:13:20 uch Exp $	*/
+/*	$NetBSD: cpu.c,v 1.9 2001/09/15 14:08:15 uch Exp $	*/
 /*-
  * Copyright (c) 1999 Shin Takemura, All rights reserved.
  * Copyright (c) 1999-2001 SATO Kazumi, All rights reserved.
@@ -55,20 +55,17 @@
  * rights to redistribute these changes.
  */
 
+#include "opt_vr41xx.h"
+#include "opt_tx39xx.h"
+
 #include <sys/param.h>
-#include <sys/device.h>
 #include <sys/systm.h>
 
-#include <mips/locore.h>
-#include <machine/cpu.h>
 #include <machine/bus.h>
 #include <machine/autoconf.h>
 #include <machine/platid.h>
 #include <machine/platid_mask.h>
 
-#include "opt_vr41xx.h"
-#include "opt_tx39xx.h"
-
 /* Definition of the driver for autoconfig. */
 static int	cpumatch(struct device *, struct cfdata *, void *);
 static void	cpuattach(struct device *, struct device *, void *);
diff --git a/sys/arch/hpcmips/hpcmips/interrupt.c b/sys/arch/hpcmips/hpcmips/interrupt.c
index e18b8c3848cb..8b8e3fc75d0b 100644
--- a/sys/arch/hpcmips/hpcmips/interrupt.c
+++ b/sys/arch/hpcmips/hpcmips/interrupt.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: interrupt.c,v 1.1 2001/06/13 06:03:11 enami Exp $	*/
+/*	$NetBSD: interrupt.c,v 1.2 2001/09/15 14:08:15 uch Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -44,10 +44,7 @@
 
 #include <uvm/uvm_extern.h>
 
-#include <machine/bus.h>
-#include <machine/autoconf.h>
-#include <machine/intr.h>
-#include <machine/locore.h>
+#include <machine/locore.h>	/* mips3_cp0_*() */
 #include <machine/sysconf.h>
 
 struct hpcmips_soft_intrhand *softnet_intrhand;
diff --git a/sys/arch/hpcmips/hpcmips/machdep.c b/sys/arch/hpcmips/hpcmips/machdep.c
index 3053082bd9af..d0e0a2860a4e 100644
--- a/sys/arch/hpcmips/hpcmips/machdep.c
+++ b/sys/arch/hpcmips/hpcmips/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.59 2001/09/15 11:13:20 uch Exp $	*/
+/*	$NetBSD: machdep.c,v 1.60 2001/09/15 14:08:15 uch Exp $	*/
 
 /*-
  * Copyright (c) 1999 Shin Takemura, All rights reserved.
@@ -72,7 +72,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.59 2001/09/15 11:13:20 uch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.60 2001/09/15 14:08:15 uch Exp $");
 
 /* from: Utah Hdr: machdep.c 1.63 91/04/24 */
 #include "opt_vr41xx.h"
@@ -89,50 +89,31 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.59 2001/09/15 11:13:20 uch Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
-#include <sys/device.h>
-#include <sys/map.h>
-#include <sys/proc.h>
+#include <sys/user.h>
 #include <sys/buf.h>
 #include <sys/reboot.h>
-#include <sys/conf.h>
-#include <sys/file.h>
-#include <sys/malloc.h>
-#include <sys/mbuf.h>
-#include <sys/msgbuf.h>
-#include <sys/ioctl.h>
-#include <sys/user.h>
 #include <sys/mount.h>
-#include <sys/syscallargs.h>
+#include <sys/sysctl.h>
 #include <sys/kcore.h>
 #include <sys/boot_flag.h>
 
+#include <ufs/mfs/mfs_extern.h>	/* mfs_initminiroot() */
+#include <dev/cons.h>		/* cntab access (cpu_reboot) */
+
+#include <machine/psl.h>
+#include <machine/sysconf.h>
+#include <machine/bootinfo.h>
+#include <machine/platid.h>
+#include <machine/platid_mask.h>
+#include <machine/bus.h>
+#include <machine/autoconf.h>
+
 #ifdef KGDB
 #include <sys/kgdb.h>
 #endif
 
-#include <uvm/uvm_extern.h>
-
-#include <sys/sysctl.h>
-#include <dev/cons.h>
-
-#include <ufs/mfs/mfs_extern.h>		/* mfs_initminiroot() */
-
-#include <machine/cpu.h>
-#include <machine/reg.h>
-#include <machine/psl.h>
-#include <machine/pte.h>
-#include <machine/bus.h>
-#include <machine/autoconf.h>
-#include <machine/sysconf.h>
-#include <machine/bootinfo.h>
-#include <machine/platid.h>
-#include <machine/platid_mask.h>
-#include <machine/locore.h>
-
 #ifdef DDB
-#include <sys/exec_aout.h>		/* XXX backwards compatilbity for DDB */
 #include <machine/db_machdep.h>
-#include <ddb/db_access.h>
 #include <ddb/db_sym.h>
 #include <ddb/db_extern.h>
 #ifndef DB_ELFSIZE
@@ -143,6 +124,7 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.59 2001/09/15 11:13:20 uch Exp $");
 #endif
 
 #if NBICONSDEV > 0
+#include <sys/conf.h>
 #include <dev/hpc/biconsvar.h>
 #include <dev/hpc/bicons.h>
 #define biconscnpollc	nullcnpollc
diff --git a/sys/arch/hpcmips/hpcmips/mainbus.c b/sys/arch/hpcmips/hpcmips/mainbus.c
index eb7469105448..62531c8f9c72 100644
--- a/sys/arch/hpcmips/hpcmips/mainbus.c
+++ b/sys/arch/hpcmips/hpcmips/mainbus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: mainbus.c,v 1.11 2001/09/15 11:13:21 uch Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.12 2001/09/15 14:08:15 uch Exp $	*/
 
 /*-
  * Copyright (c) 1999
@@ -39,7 +39,6 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/device.h>
 
 #include <machine/bus.h>
 #include <machine/autoconf.h>