From 86a1c05db0a76e4c267995b70788f2ff5e9d8ddc Mon Sep 17 00:00:00 2001
From: Bruce Evans <bde@FreeBSD.org>
Date: Wed, 6 Dec 1995 23:44:23 +0000
Subject: [PATCH] Removed unnecessary #includes of <sys/user.h>.  Some of these
 were just to get the definitions of TRUE and FALSE which happen to be defined
 in a deeply nested include.

Added nearby #includes of <sys/conf.h> where appropriate.
---
 sys/dev/cy/cy.c               |  3 +--
 sys/dev/cy/cy_isa.c           |  3 +--
 sys/dev/mse/mse.c             |  4 ++--
 sys/dev/rc/rc.c               |  1 -
 sys/dev/sio/sio.c             |  3 +--
 sys/gnu/isdn/iispy.c          | 10 +++++++---
 sys/i386/ibcs2/ibcs2_sysi86.c |  1 -
 sys/i386/isa/aic6360.c        |  3 +--
 sys/i386/isa/asc.c            |  5 ++---
 sys/i386/isa/ctx.c            |  4 ++--
 sys/i386/isa/cy.c             |  3 +--
 sys/i386/isa/gpib.c           |  2 +-
 sys/i386/isa/gsc.c            |  2 +-
 sys/i386/isa/mse.c            |  4 ++--
 sys/i386/isa/ncr5380.c        |  1 -
 sys/i386/isa/rc.c             |  1 -
 sys/i386/isa/sio.c            |  3 +--
 sys/i386/isa/tw.c             |  2 +-
 sys/isa/sio.c                 |  3 +--
 sys/scsi/ch.c                 |  3 +--
 sys/scsi/st.c                 |  3 +--
 21 files changed, 27 insertions(+), 37 deletions(-)

diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c
index 9ce995757e4d..ae025c0e8f71 100644
--- a/sys/dev/cy/cy.c
+++ b/sys/dev/cy/cy.c
@@ -27,7 +27,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: cy.c,v 1.21 1995/11/29 10:47:35 julian Exp $
+ *	$Id: cy.c,v 1.22 1995/11/29 14:39:37 julian Exp $
  */
 
 #include "cy.h"
@@ -77,7 +77,6 @@
 #include <sys/ioctl.h>
 #include <sys/tty.h>
 #include <sys/proc.h>
-#include <sys/user.h>
 #include <sys/conf.h>
 #include <sys/dkstat.h>
 #include <sys/file.h>
diff --git a/sys/dev/cy/cy_isa.c b/sys/dev/cy/cy_isa.c
index 9ce995757e4d..ae025c0e8f71 100644
--- a/sys/dev/cy/cy_isa.c
+++ b/sys/dev/cy/cy_isa.c
@@ -27,7 +27,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: cy.c,v 1.21 1995/11/29 10:47:35 julian Exp $
+ *	$Id: cy.c,v 1.22 1995/11/29 14:39:37 julian Exp $
  */
 
 #include "cy.h"
@@ -77,7 +77,6 @@
 #include <sys/ioctl.h>
 #include <sys/tty.h>
 #include <sys/proc.h>
-#include <sys/user.h>
 #include <sys/conf.h>
 #include <sys/dkstat.h>
 #include <sys/file.h>
diff --git a/sys/dev/mse/mse.c b/sys/dev/mse/mse.c
index 82411de56d3a..8e9fa7bfd997 100644
--- a/sys/dev/mse/mse.c
+++ b/sys/dev/mse/mse.c
@@ -11,7 +11,7 @@
  * this software for any purpose.  It is provided "as is"
  * without express or implied warranty.
  *
- * $Id: mse.c,v 1.17 1995/11/29 10:47:46 julian Exp $
+ * $Id: mse.c,v 1.18 1995/11/29 14:39:47 julian Exp $
  */
 /*
  * Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and
@@ -48,8 +48,8 @@
 #if NMSE > 0
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/conf.h>
 #include <sys/proc.h>
-#include <sys/user.h>
 #include <sys/buf.h>
 #include <sys/kernel.h>
 #include <sys/ioctl.h>
diff --git a/sys/dev/rc/rc.c b/sys/dev/rc/rc.c
index deea59594ca8..e4e3325f6572 100644
--- a/sys/dev/rc/rc.c
+++ b/sys/dev/rc/rc.c
@@ -40,7 +40,6 @@
 #include <sys/ioctl.h>
 #include <sys/tty.h>
 #include <sys/proc.h>
-#include <sys/user.h>
 #include <sys/conf.h>
 #include <sys/dkstat.h>
 #include <sys/file.h>
diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c
index 5e6800cd84b0..b6b090fa87b2 100644
--- a/sys/dev/sio/sio.c
+++ b/sys/dev/sio/sio.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.122 1995/11/29 14:39:57 julian Exp $
+ *	$Id: sio.c,v 1.123 1995/11/29 15:00:07 bde Exp $
  */
 
 #include "sio.h"
@@ -51,7 +51,6 @@
 #include <sys/ioctl.h>
 #include <sys/tty.h>
 #include <sys/proc.h>
-#include <sys/user.h>
 #include <sys/conf.h>
 #include <sys/dkstat.h>
 #include <sys/file.h>
diff --git a/sys/gnu/isdn/iispy.c b/sys/gnu/isdn/iispy.c
index 2e498043582d..e708d4d4a1bf 100644
--- a/sys/gnu/isdn/iispy.c
+++ b/sys/gnu/isdn/iispy.c
@@ -1,6 +1,6 @@
-static char     _ispyid[] = "@(#)$Id: iispy.c,v 1.5 1995/11/29 10:47:07 julian Exp $";
+static char     _ispyid[] = "@(#)$Id: iispy.c,v 1.6 1995/11/29 14:39:10 julian Exp $";
 /*******************************************************************************
- *  II - Version 0.1 $Revision: 1.5 $   $State: Exp $
+ *  II - Version 0.1 $Revision: 1.6 $   $State: Exp $
  *
  * Copyright 1994 Dietmar Friede
  *******************************************************************************
@@ -10,6 +10,10 @@ static char     _ispyid[] = "@(#)$Id: iispy.c,v 1.5 1995/11/29 10:47:07 julian E
  *
  *******************************************************************************
  * $Log: iispy.c,v $
+ * Revision 1.6  1995/11/29  14:39:10  julian
+ * If you're going to mechanically replicate something in 50 files
+ * it's best to not have a (compiles cleanly) typo in it! (sigh)
+ *
  * Revision 1.5  1995/11/29  10:47:07  julian
  * OK, that's it..
  * That's EVERY SINGLE driver that has an entry in conf.c..
@@ -46,10 +50,10 @@ static char     _ispyid[] = "@(#)$Id: iispy.c,v 1.5 1995/11/29 10:47:07 julian E
 #include "param.h"
 #include "buf.h"
 #include "systm.h"
+#include "conf.h"
 #include "ioctl.h"
 #include "tty.h"
 #include "proc.h"
-#include "user.h"
 #include "uio.h"
 #include <sys/kernel.h>
 /*#include "malloc.h"*/
diff --git a/sys/i386/ibcs2/ibcs2_sysi86.c b/sys/i386/ibcs2/ibcs2_sysi86.c
index 36d02f8166f8..f10f0f963cd6 100644
--- a/sys/i386/ibcs2/ibcs2_sysi86.c
+++ b/sys/i386/ibcs2/ibcs2_sysi86.c
@@ -33,7 +33,6 @@
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
-#include <sys/user.h>
 #include <sys/sysctl.h>
 
 #include <i386/ibcs2/ibcs2_types.h>
diff --git a/sys/i386/isa/aic6360.c b/sys/i386/isa/aic6360.c
index 09ebde8d8802..e740bdd06d78 100644
--- a/sys/i386/isa/aic6360.c
+++ b/sys/i386/isa/aic6360.c
@@ -31,7 +31,7 @@
  */
 
 /*
- * $Id: aic6360.c,v 1.13 1995/11/04 17:07:05 bde Exp $
+ * $Id: aic6360.c,v 1.14 1995/11/29 10:26:51 phk Exp $
  *
  * Acknowledgements: Many of the algorithms used in this driver are
  * inspired by the work of Julian Elischer (julian@tfs.com) and
@@ -127,7 +127,6 @@
 #endif
 #include <sys/buf.h>
 #include <sys/proc.h>
-#include <sys/user.h>
 #include <sys/queue.h>
 #ifndef __FreeBSD__
 #include <machine/pio.h>
diff --git a/sys/i386/isa/asc.c b/sys/i386/isa/asc.c
index 05b168d6feb1..2050c7681919 100644
--- a/sys/i386/isa/asc.c
+++ b/sys/i386/isa/asc.c
@@ -34,7 +34,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
- * $Id: asc.c,v 1.7 1995/11/29 10:47:24 julian Exp $
+ * $Id: asc.c,v 1.8 1995/11/29 14:39:31 julian Exp $
  */
 
 #include "asc.h"
@@ -43,7 +43,6 @@
 #include "param.h"
 #include "systm.h"
 #include "proc.h"
-#include "user.h"
 #include "buf.h"
 #include "malloc.h"
 #include "kernel.h"
@@ -60,8 +59,8 @@
 #else
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/conf.h>
 #include <sys/proc.h>
-#include <sys/user.h>
 #include <sys/buf.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
diff --git a/sys/i386/isa/ctx.c b/sys/i386/isa/ctx.c
index 8a567cadf0ad..19b9671ba31d 100644
--- a/sys/i386/isa/ctx.c
+++ b/sys/i386/isa/ctx.c
@@ -8,7 +8,7 @@
  *	of this software, nor does the author assume any responsibility
  *	for damages incurred with its use.
  *
- *	$Id: ctx.c,v 1.9 1995/11/29 10:47:27 julian Exp $
+ *	$Id: ctx.c,v 1.10 1995/11/29 14:39:33 julian Exp $
  */
 
 /*
@@ -113,9 +113,9 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/conf.h>
 #include <sys/ioctl.h>
 #include <sys/proc.h>
-#include <sys/user.h>
 #include <sys/uio.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
diff --git a/sys/i386/isa/cy.c b/sys/i386/isa/cy.c
index 9ce995757e4d..ae025c0e8f71 100644
--- a/sys/i386/isa/cy.c
+++ b/sys/i386/isa/cy.c
@@ -27,7 +27,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: cy.c,v 1.21 1995/11/29 10:47:35 julian Exp $
+ *	$Id: cy.c,v 1.22 1995/11/29 14:39:37 julian Exp $
  */
 
 #include "cy.h"
@@ -77,7 +77,6 @@
 #include <sys/ioctl.h>
 #include <sys/tty.h>
 #include <sys/proc.h>
-#include <sys/user.h>
 #include <sys/conf.h>
 #include <sys/dkstat.h>
 #include <sys/file.h>
diff --git a/sys/i386/isa/gpib.c b/sys/i386/isa/gpib.c
index f5e216ee9035..1d0b1ac21688 100644
--- a/sys/i386/isa/gpib.c
+++ b/sys/i386/isa/gpib.c
@@ -29,7 +29,7 @@
 #include "systm.h"
 #include "sys/ioctl.h"
 #include "proc.h"
-#include "user.h"
+#include "conf.h"
 #include "uio.h"
 #include "kernel.h"
 #include "malloc.h"
diff --git a/sys/i386/isa/gsc.c b/sys/i386/isa/gsc.c
index 57e52008c2ad..e8dfadec1972 100644
--- a/sys/i386/isa/gsc.c
+++ b/sys/i386/isa/gsc.c
@@ -38,7 +38,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
-#include <sys/user.h>
+#include <sys/conf.h>
 #include <sys/buf.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
diff --git a/sys/i386/isa/mse.c b/sys/i386/isa/mse.c
index 82411de56d3a..8e9fa7bfd997 100644
--- a/sys/i386/isa/mse.c
+++ b/sys/i386/isa/mse.c
@@ -11,7 +11,7 @@
  * this software for any purpose.  It is provided "as is"
  * without express or implied warranty.
  *
- * $Id: mse.c,v 1.17 1995/11/29 10:47:46 julian Exp $
+ * $Id: mse.c,v 1.18 1995/11/29 14:39:47 julian Exp $
  */
 /*
  * Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and
@@ -48,8 +48,8 @@
 #if NMSE > 0
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/conf.h>
 #include <sys/proc.h>
-#include <sys/user.h>
 #include <sys/buf.h>
 #include <sys/kernel.h>
 #include <sys/ioctl.h>
diff --git a/sys/i386/isa/ncr5380.c b/sys/i386/isa/ncr5380.c
index 790a044434c4..59cd738a9670 100644
--- a/sys/i386/isa/ncr5380.c
+++ b/sys/i386/isa/ncr5380.c
@@ -45,7 +45,6 @@
 #include <sys/malloc.h>
 #include <sys/buf.h>
 #include <sys/proc.h>
-#include <sys/user.h>
 #include <sys/devconf.h>
 
 #include <machine/clock.h>
diff --git a/sys/i386/isa/rc.c b/sys/i386/isa/rc.c
index deea59594ca8..e4e3325f6572 100644
--- a/sys/i386/isa/rc.c
+++ b/sys/i386/isa/rc.c
@@ -40,7 +40,6 @@
 #include <sys/ioctl.h>
 #include <sys/tty.h>
 #include <sys/proc.h>
-#include <sys/user.h>
 #include <sys/conf.h>
 #include <sys/dkstat.h>
 #include <sys/file.h>
diff --git a/sys/i386/isa/sio.c b/sys/i386/isa/sio.c
index 5e6800cd84b0..b6b090fa87b2 100644
--- a/sys/i386/isa/sio.c
+++ b/sys/i386/isa/sio.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.122 1995/11/29 14:39:57 julian Exp $
+ *	$Id: sio.c,v 1.123 1995/11/29 15:00:07 bde Exp $
  */
 
 #include "sio.h"
@@ -51,7 +51,6 @@
 #include <sys/ioctl.h>
 #include <sys/tty.h>
 #include <sys/proc.h>
-#include <sys/user.h>
 #include <sys/conf.h>
 #include <sys/dkstat.h>
 #include <sys/file.h>
diff --git a/sys/i386/isa/tw.c b/sys/i386/isa/tw.c
index a72224d89e48..7eb75e08cc90 100644
--- a/sys/i386/isa/tw.c
+++ b/sys/i386/isa/tw.c
@@ -131,7 +131,7 @@
 #include "param.h"
 #include "systm.h"
 #include "proc.h"
-#include "user.h"
+#include "conf.h"
 #include "buf.h"
 #include "kernel.h"
 #include "ioctl.h"
diff --git a/sys/isa/sio.c b/sys/isa/sio.c
index 5e6800cd84b0..b6b090fa87b2 100644
--- a/sys/isa/sio.c
+++ b/sys/isa/sio.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)com.c	7.5 (Berkeley) 5/16/91
- *	$Id: sio.c,v 1.122 1995/11/29 14:39:57 julian Exp $
+ *	$Id: sio.c,v 1.123 1995/11/29 15:00:07 bde Exp $
  */
 
 #include "sio.h"
@@ -51,7 +51,6 @@
 #include <sys/ioctl.h>
 #include <sys/tty.h>
 #include <sys/proc.h>
-#include <sys/user.h>
 #include <sys/conf.h>
 #include <sys/dkstat.h>
 #include <sys/file.h>
diff --git a/sys/scsi/ch.c b/sys/scsi/ch.c
index b95a87245f88..9724593ec3b9 100644
--- a/sys/scsi/ch.c
+++ b/sys/scsi/ch.c
@@ -2,7 +2,7 @@
  * Written by grefen@convex.com (probably moved by now)
  * Based on scsi drivers by Julian Elischer (julian@tfs.com)
  *
- *      $Id: ch.c,v 1.23 1995/11/29 10:48:56 julian Exp $
+ *      $Id: ch.c,v 1.24 1995/11/29 14:40:54 julian Exp $
  */
 
 #include	<sys/types.h>
@@ -15,7 +15,6 @@
 #include <sys/ioctl.h>
 #include <sys/buf.h>
 #include <sys/proc.h>
-#include <sys/user.h>
 #include <sys/chio.h>
 #include <sys/malloc.h>
 
diff --git a/sys/scsi/st.c b/sys/scsi/st.c
index f7c5964d8d65..4dc59c57894e 100644
--- a/sys/scsi/st.c
+++ b/sys/scsi/st.c
@@ -12,7 +12,7 @@
  * on the understanding that TFS is not responsible for the correct
  * functioning of this software in any circumstances.
  *
- * $Id: st.c,v 1.46 1995/11/29 14:41:04 julian Exp $
+ * $Id: st.c,v 1.47 1995/11/30 07:43:47 pst Exp $
  */
 
 /*
@@ -38,7 +38,6 @@
 #include <sys/malloc.h>
 #include <sys/buf.h>
 #include <sys/proc.h>
-#include <sys/user.h>
 #include <sys/mtio.h>
 
 #include <scsi/scsi_all.h>