diff options
author | bde <bde@FreeBSD.org> | 1997-03-24 11:37:53 +0000 |
---|---|---|
committer | bde <bde@FreeBSD.org> | 1997-03-24 11:37:53 +0000 |
commit | f62eb55e940cabd9e329f3c32c6c592554ad6354 (patch) | |
tree | 34a7750c9ca2a0ae08fc728d11fb4a983cccc7a4 | |
parent | e79c0a4ca0faee32b600b7c2b384b85fde731307 (diff) | |
download | FreeBSD-src-f62eb55e940cabd9e329f3c32c6c592554ad6354.zip FreeBSD-src-f62eb55e940cabd9e329f3c32c6c592554ad6354.tar.gz |
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.
-rw-r--r-- | sys/compat/linux/linux_ioctl.c | 5 | ||||
-rw-r--r-- | sys/dev/snp/snp.c | 2 | ||||
-rw-r--r-- | sys/fs/fifofs/fifo_vnops.c | 4 | ||||
-rw-r--r-- | sys/i386/ibcs2/ibcs2_ioctl.c | 2 | ||||
-rw-r--r-- | sys/i386/ibcs2/ibcs2_xenix.c | 4 | ||||
-rw-r--r-- | sys/i386/linux/linux_ioctl.c | 5 | ||||
-rw-r--r-- | sys/kern/tty_snoop.c | 2 | ||||
-rw-r--r-- | sys/miscfs/fifofs/fifo_vnops.c | 4 |
8 files changed, 13 insertions, 15 deletions
diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c index 75bf626..e748a88 100644 --- a/sys/compat/linux/linux_ioctl.c +++ b/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> diff --git a/sys/dev/snp/snp.c b/sys/dev/snp/snp.c index fbb6f91..6e2bf5d 100644 --- a/sys/dev/snp/snp.c +++ b/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> diff --git a/sys/fs/fifofs/fifo_vnops.c b/sys/fs/fifofs/fifo_vnops.c index 683c10b..1cdc3d7 100644 --- a/sys/fs/fifofs/fifo_vnops.c +++ b/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> diff --git a/sys/i386/ibcs2/ibcs2_ioctl.c b/sys/i386/ibcs2/ibcs2_ioctl.c index 6093845..a5fb7f7 100644 --- a/sys/i386/ibcs2/ibcs2_ioctl.c +++ b/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> diff --git a/sys/i386/ibcs2/ibcs2_xenix.c b/sys/i386/ibcs2/ibcs2_xenix.c index 6af6be3..065735e 100644 --- a/sys/i386/ibcs2/ibcs2_xenix.c +++ b/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> diff --git a/sys/i386/linux/linux_ioctl.c b/sys/i386/linux/linux_ioctl.c index 75bf626..e748a88 100644 --- a/sys/i386/linux/linux_ioctl.c +++ b/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> diff --git a/sys/kern/tty_snoop.c b/sys/kern/tty_snoop.c index fbb6f91..6e2bf5d 100644 --- a/sys/kern/tty_snoop.c +++ b/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> diff --git a/sys/miscfs/fifofs/fifo_vnops.c b/sys/miscfs/fifofs/fifo_vnops.c index 683c10b..1cdc3d7 100644 --- a/sys/miscfs/fifofs/fifo_vnops.c +++ b/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> |