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

<sys/filio.h> instead of <sys/ioctl.h> in non-network non-tty files.

sys/compat/linux/linux_ioctl.c

@@ -25,22 +25,21 @@
  * (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: linux_ioctl.c,v 1.14 1997/02/22 09:38:21 peter Exp $
+ *  $Id: linux_ioctl.c,v 1.15 1997/03/23 03:36:01 bde Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sysproto.h>
 #include <sys/proc.h>
-#include <sys/ioctl.h>
 #include <sys/ioctl_compat.h>
 #include <sys/fcntl.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
+#include <sys/filio.h>
 #include <sys/tty.h>
 #include <sys/termios.h>
 #include <sys/socket.h>
-#include <sys/ioctl.h>
 #include <net/if.h>
 #include <sys/sockio.h>
 

sys/dev/snp/snp.c

@@ -19,7 +19,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/ioctl.h>
+#include <sys/filio.h>
 #include <sys/ioctl_compat.h>	/* Oooh..We need O/NTTYDISC	 */
 #include <sys/proc.h>
 #include <sys/tty.h>

sys/fs/fifofs/fifo_vnops.c

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fifo_vnops.c	8.10 (Berkeley) 5/27/95
- * $Id: fifo_vnops.c,v 1.22 1997/02/22 09:40:17 peter Exp $
+ * $Id: fifo_vnops.c,v 1.23 1997/03/23 03:36:49 bde Exp $
  */
 
 #include <sys/param.h>
@@ -45,7 +45,7 @@
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/stat.h>
-#include <sys/ioctl.h>
+#include <sys/filio.h>
 #include <sys/fcntl.h>
 #include <sys/file.h>
 #include <sys/errno.h>

sys/i386/ibcs2/ibcs2_ioctl.c

@@ -35,7 +35,7 @@
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/filedesc.h>
-#include <sys/ioctl.h>
+#include <sys/filio.h>
 #include <sys/ioctl_compat.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>

sys/i386/ibcs2/ibcs2_xenix.c

@@ -27,7 +27,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$
+ *	$Id: ibcs2_xenix.c,v 1.9 1997/02/22 09:33:29 peter Exp $
  */
 
 #include <sys/param.h>
@@ -36,7 +36,7 @@
 #include <sys/sysproto.h>
 #include <sys/kernel.h>
 #include <sys/exec.h>
-#include <sys/ioctl.h>
+#include <sys/filio.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
 #include <sys/sysctl.h>

sys/i386/linux/linux_ioctl.c

@@ -25,22 +25,21 @@
  * (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: linux_ioctl.c,v 1.14 1997/02/22 09:38:21 peter Exp $
+ *  $Id: linux_ioctl.c,v 1.15 1997/03/23 03:36:01 bde Exp $
  */
 
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sysproto.h>
 #include <sys/proc.h>
-#include <sys/ioctl.h>
 #include <sys/ioctl_compat.h>
 #include <sys/fcntl.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
+#include <sys/filio.h>
 #include <sys/tty.h>
 #include <sys/termios.h>
 #include <sys/socket.h>
-#include <sys/ioctl.h>
 #include <net/if.h>
 #include <sys/sockio.h>
 

sys/kern/tty_snoop.c

@@ -19,7 +19,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/ioctl.h>
+#include <sys/filio.h>
 #include <sys/ioctl_compat.h>	/* Oooh..We need O/NTTYDISC	 */
 #include <sys/proc.h>
 #include <sys/tty.h>

sys/miscfs/fifofs/fifo_vnops.c

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fifo_vnops.c	8.10 (Berkeley) 5/27/95
- * $Id: fifo_vnops.c,v 1.22 1997/02/22 09:40:17 peter Exp $
+ * $Id: fifo_vnops.c,v 1.23 1997/03/23 03:36:49 bde Exp $
  */
 
 #include <sys/param.h>
@@ -45,7 +45,7 @@
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/stat.h>
-#include <sys/ioctl.h>
+#include <sys/filio.h>
 #include <sys/fcntl.h>
 #include <sys/file.h>
 #include <sys/errno.h>