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

<sys/ttycom.h> and sometimes <sys/filio.h> instead of <sys/ioctl.h>
in miscellaneous files.  Most of these files have nothing to do
with ttys but need to include <sys/ttycom.h> to get the definitions
of TIOC[SG]PGRP which are (ab)used to convert F[SG]ETOWN fcntls into
ioctls.

7 files changed, 20 insertions, 14 deletions

diff --git a/sys/i386/ibcs2/ibcs2_fcntl.c b/sys/i386/ibcs2/ibcs2_fcntl.c
index ca25ea1571a1..7c77b80a20da 100644
--- a/sys/i386/ibcs2/ibcs2_fcntl.c
+++ b/sys/i386/ibcs2/ibcs2_fcntl.c
@@ -24,7 +24,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: ibcs2_fcntl.c,v 1.6 1997/02/22 09:33:18 peter Exp $
+ * $Id: ibcs2_fcntl.c,v 1.7 1997/03/23 03:34:03 bde Exp $
  */
 
 #include <sys/param.h>
@@ -35,7 +35,7 @@
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/filedesc.h>
-#include <sys/ioctl.h>
+#include <sys/ttycom.h>
 #include <sys/kernel.h>
 #include <sys/mount.h>
 #include <sys/malloc.h>
diff --git a/sys/kern/subr_log.c b/sys/kern/subr_log.c
index a2d31dd659b3..14187097d5d5 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.20 1997/02/22 09:39:16 peter Exp $
+ * $Id: subr_log.c,v 1.21 1997/03/23 03:36:22 bde Exp $
  */
 
 /*
@@ -43,7 +43,8 @@
 #include <sys/conf.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
-#include <sys/ioctl.h>
+#include <sys/filio.h>
+#include <sys/ttycom.h>
 #include <sys/msgbuf.h>
 #include <sys/fcntl.h>
 #include <sys/signalvar.h>
diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c
index 5bbb3f164591..2bcfd681b3d7 100644
--- a/sys/kern/sys_generic.c
+++ b/sys/kern/sys_generic.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)sys_generic.c	8.5 (Berkeley) 1/21/94
- * $Id: sys_generic.c,v 1.24 1997/03/22 08:03:36 bde Exp $
+ * $Id: sys_generic.c,v 1.25 1997/03/23 03:36:23 bde Exp $
  */
 
 #include "opt_ktrace.h"
@@ -45,7 +45,8 @@
 #include <sys/systm.h>
 #include <sys/sysproto.h>
 #include <sys/filedesc.h>
-#include <sys/ioctl.h>
+#include <sys/filio.h>
+#include <sys/ttycom.h>
 #include <sys/fcntl.h>
 #include <sys/file.h>
 #include <sys/proc.h>
diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c
index 71bbed0a3347..5beac60651da 100644
--- a/sys/kern/sys_pipe.c
+++ b/sys/kern/sys_pipe.c
@@ -16,7 +16,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- * $Id: sys_pipe.c,v 1.25 1997/03/22 06:52:57 bde Exp $
+ * $Id: sys_pipe.c,v 1.26 1997/03/23 03:36:24 bde Exp $
  */
 
 #ifndef OLD_PIPE
@@ -60,7 +60,8 @@
 #include <sys/stat.h>
 #include <sys/filedesc.h>
 #include <sys/malloc.h>
-#include <sys/ioctl.h>
+#include <sys/filio.h>
+#include <sys/ttycom.h>
 #include <sys/stat.h>
 #include <sys/select.h>
 #include <sys/signalvar.h>
diff --git a/sys/kern/sys_socket.c b/sys/kern/sys_socket.c
index f8b027d209c9..c3e66158c31d 100644
--- a/sys/kern/sys_socket.c
+++ b/sys/kern/sys_socket.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)sys_socket.c	8.1 (Berkeley) 6/10/93
- * $Id: sys_socket.c,v 1.10 1997/02/22 09:39:20 peter Exp $
+ * $Id: sys_socket.c,v 1.11 1997/03/23 03:36:25 bde Exp $
  */
 
 #include <sys/param.h>
@@ -45,7 +45,8 @@
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/socketvar.h>
-#include <sys/ioctl.h>
+#include <sys/filio.h>			/* XXX */
+#include <sys/sockio.h>
 #include <sys/stat.h>
 
 #include <net/if.h>
diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c
index 431913ffe966..cb6c9324887c 100644
--- a/sys/kern/vfs_vnops.c
+++ b/sys/kern/vfs_vnops.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_vnops.c	8.2 (Berkeley) 1/21/94
- * $Id: vfs_vnops.c,v 1.32 1997/03/08 15:14:30 guido Exp $
+ * $Id: vfs_vnops.c,v 1.33 1997/03/23 03:36:38 bde Exp $
  */
 
 #include <sys/param.h>
@@ -50,7 +50,8 @@
 #include <sys/mount.h>
 #include <sys/namei.h>
 #include <sys/vnode.h>
-#include <sys/ioctl.h>
+#include <sys/filio.h>
+#include <sys/ttycom.h>
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>
diff --git a/sys/net/if_ppp.c b/sys/net/if_ppp.c
index fe4479fdc8fd..2abdf2d4f964 100644
--- a/sys/net/if_ppp.c
+++ b/sys/net/if_ppp.c
@@ -69,7 +69,7 @@
  * Paul Mackerras (paulus@cs.anu.edu.au).
  */
 
-/* $Id$ */
+/* $Id: if_ppp.c,v 1.39 1997/02/22 09:41:03 peter Exp $ */
 /* from if_ppp.c,v 1.5 1995/08/16 01:36:38 paulus Exp */
 /* from if_sl.c,v 1.11 84/10/04 12:54:47 rick Exp */
 
@@ -84,7 +84,8 @@
 #include <sys/proc.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
-#include <sys/ioctl.h>
+#include <sys/filio.h>
+#include <sys/sockio.h>
 #include <sys/kernel.h>
 
 #include <net/if.h>