Don't include <sys/ioctl.h> in the kernel. Stage 1: don't include

it when it is not used.  In most cases, the reasons for including it
went away when the special ioctl headers became self-sufficient.

8 files changed, 8 insertions, 16 deletions

diff --git a/sys/kern/kern_acct.c b/sys/kern/kern_acct.c
index fbbe6f4..f72d2d0 100644
--- a/sys/kern/kern_acct.c
+++ b/sys/kern/kern_acct.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_acct.c	8.1 (Berkeley) 6/14/93
- *	$Id: kern_acct.c,v 1.13 1997/02/22 09:39:00 peter Exp $
+ *	$Id: kern_acct.c,v 1.14 1997/03/23 03:36:17 bde Exp $
  */
 
 #include <sys/param.h>
@@ -55,7 +55,6 @@
 #include <sys/errno.h>
 #include <sys/acct.h>
 #include <sys/resourcevar.h>
-#include <sys/ioctl.h>
 #include <sys/tty.h>
 
 /*
diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c
index bd67d8b..2f8074c 100644
--- a/sys/kern/kern_exit.c
+++ b/sys/kern/kern_exit.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_exit.c	8.7 (Berkeley) 2/12/94
- * $Id$
+ * $Id: kern_exit.c,v 1.45 1997/02/22 09:39:04 peter Exp $
  */
 
 #include "opt_ktrace.h"
@@ -45,7 +45,6 @@
 #include <sys/systm.h>
 #include <sys/sysproto.h>
 #include <sys/sysent.h>
-#include <sys/ioctl.h>
 #include <sys/proc.h>
 #include <sys/tty.h>
 #include <sys/time.h>
diff --git a/sys/kern/kern_lkm.c b/sys/kern/kern_lkm.c
index 16fd67b..f371c37 100644
--- a/sys/kern/kern_lkm.c
+++ b/sys/kern/kern_lkm.c
@@ -30,13 +30,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: kern_lkm.c,v 1.37 1997/02/27 16:40:20 bde Exp $
+ * $Id: kern_lkm.c,v 1.38 1997/03/23 03:36:20 bde Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sysproto.h>
-#include <sys/ioctl.h>
 #include <sys/tty.h>
 #include <sys/conf.h>
 #include <sys/fcntl.h>
diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c
index a49a1de..cecf89f 100644
--- a/sys/kern/kern_proc.c
+++ b/sys/kern/kern_proc.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_proc.c	8.7 (Berkeley) 2/14/95
- * $Id$
+ * $Id: kern_proc.c,v 1.25 1997/02/22 09:39:08 peter Exp $
  */
 
 #include <sys/param.h>
@@ -47,7 +47,6 @@
 #include <sys/uio.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
-#include <sys/ioctl.h>
 #include <sys/tty.h>
 #include <sys/signalvar.h>
 #include <vm/vm.h>
diff --git a/sys/kern/subr_clist.c b/sys/kern/subr_clist.c
index 24091f6..d907b47 100644
--- a/sys/kern/subr_clist.c
+++ b/sys/kern/subr_clist.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: tty_subr.c,v 1.25 1997/02/22 09:39:26 peter Exp $
+ * $Id: tty_subr.c,v 1.26 1997/03/05 16:45:01 bde Exp $
  */
 
 /*
@@ -34,7 +34,6 @@
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
-#include <sys/ioctl.h>
 #include <sys/tty.h>
 #include <sys/clist.h>
 #include <sys/malloc.h>
diff --git a/sys/kern/subr_diskslice.c b/sys/kern/subr_diskslice.c
index f9648e0..44e01b0 100644
--- a/sys/kern/subr_diskslice.c
+++ b/sys/kern/subr_diskslice.c
@@ -43,7 +43,7 @@
  *	from: wd.c,v 1.55 1994/10/22 01:57:12 phk Exp $
  *	from: @(#)ufs_disksubr.c	7.16 (Berkeley) 5/4/91
  *	from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $
- *	$Id$
+ *	$Id: subr_diskslice.c,v 1.35 1997/02/22 09:39:15 peter Exp $
  */
 
 #include <sys/param.h>
@@ -56,7 +56,6 @@
 #include <sys/diskslice.h>
 #include <sys/dkbad.h>
 #include <sys/fcntl.h>
-#include <sys/ioctl.h>
 #include <sys/malloc.h>
 #include <sys/stat.h>
 #include <sys/syslog.h>
diff --git a/sys/kern/tty_subr.c b/sys/kern/tty_subr.c
index 24091f6..d907b47 100644
--- a/sys/kern/tty_subr.c
+++ b/sys/kern/tty_subr.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: tty_subr.c,v 1.25 1997/02/22 09:39:26 peter Exp $
+ * $Id: tty_subr.c,v 1.26 1997/03/05 16:45:01 bde Exp $
  */
 
 /*
@@ -34,7 +34,6 @@
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
-#include <sys/ioctl.h>
 #include <sys/tty.h>
 #include <sys/clist.h>
 #include <sys/malloc.h>
diff --git a/sys/kern/tty_tty.c b/sys/kern/tty_tty.c
index b1acc26..be164d5 100644
--- a/sys/kern/tty_tty.c
+++ b/sys/kern/tty_tty.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty_tty.c	8.2 (Berkeley) 9/23/93
- * $Id: tty_tty.c,v 1.14 1997/02/22 09:39:27 peter Exp $
+ * $Id: tty_tty.c,v 1.15 1997/03/23 03:36:30 bde Exp $
  */
 
 /*
@@ -40,7 +40,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
-#include <sys/ioctl.h>
 #include <sys/proc.h>
 #include <sys/tty.h>
 #include <sys/vnode.h>