diff options
77 files changed, 144 insertions, 126 deletions
diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c index c2e8780..75bf626 100644 --- a/sys/compat/linux/linux_ioctl.c +++ b/sys/compat/linux/linux_ioctl.c @@ -25,7 +25,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: linux_ioctl.c,v 1.14 1997/02/22 09:38:21 peter Exp $ */ #include <sys/param.h> @@ -34,6 +34,7 @@ #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/tty.h> diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index 0fb8085..706e83d 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -25,7 +25,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: linux_misc.c,v 1.24 1997/02/22 09:38:23 peter Exp $ */ #include <sys/param.h> @@ -36,7 +36,7 @@ #include <sys/mman.h> #include <sys/proc.h> #include <sys/dirent.h> -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/filedesc.h> #include <sys/ioctl.h> #include <sys/imgact_aout.h> diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c index 1bbc540..54443dc 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$ + * $Id: cy.c,v 1.45 1997/02/22 09:36:03 peter Exp $ */ #include "cy.h" @@ -76,7 +76,7 @@ #include <sys/proc.h> #include <sys/conf.h> #include <sys/dkstat.h> -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/uio.h> #include <sys/kernel.h> #include <sys/malloc.h> diff --git a/sys/dev/cy/cy_isa.c b/sys/dev/cy/cy_isa.c index 1bbc540..54443dc 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$ + * $Id: cy.c,v 1.45 1997/02/22 09:36:03 peter Exp $ */ #include "cy.h" @@ -76,7 +76,7 @@ #include <sys/proc.h> #include <sys/conf.h> #include <sys/dkstat.h> -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/uio.h> #include <sys/kernel.h> #include <sys/malloc.h> diff --git a/sys/dev/dgb/dgb.c b/sys/dev/dgb/dgb.c index af4fcc2..10f7728 100644 --- a/sys/dev/dgb/dgb.c +++ b/sys/dev/dgb/dgb.c @@ -1,5 +1,5 @@ /*- - * dgb.c $Id$ + * dgb.c $Id: dgb.c,v 1.23 1997/02/22 09:29:42 peter Exp $ * * Digiboard driver. * @@ -50,7 +50,7 @@ #include <sys/proc.h> #include <sys/conf.h> #include <sys/dkstat.h> -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/uio.h> #include <sys/kernel.h> #include <sys/sysctl.h> diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c index e08c637..b18ad71 100644 --- a/sys/dev/fdc/fdc.c +++ b/sys/dev/fdc/fdc.c @@ -43,7 +43,7 @@ * SUCH DAMAGE. * * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 - * $Id$ + * $Id: fd.c,v 1.97 1997/02/22 09:36:09 peter Exp $ * */ @@ -59,7 +59,7 @@ #include <sys/systm.h> #include <sys/kernel.h> #include <sys/conf.h> -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/ioctl.h> #include <machine/clock.h> #include <machine/ioctl_fd.h> diff --git a/sys/dev/mcd/mcd.c b/sys/dev/mcd/mcd.c index 4fa6086..d48add7 100644 --- a/sys/dev/mcd/mcd.c +++ b/sys/dev/mcd/mcd.c @@ -40,7 +40,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$ + * $Id: mcd.c,v 1.85 1997/02/22 09:36:53 peter Exp $ */ static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore"; @@ -50,7 +50,7 @@ static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore"; #include <sys/param.h> #include <sys/systm.h> #include <sys/conf.h> -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/buf.h> #include <sys/proc.h> #include <sys/stat.h> diff --git a/sys/dev/rc/rc.c b/sys/dev/rc/rc.c index 677ae14..5a2ce2c 100644 --- a/sys/dev/rc/rc.c +++ b/sys/dev/rc/rc.c @@ -44,7 +44,7 @@ #include <sys/proc.h> #include <sys/conf.h> #include <sys/dkstat.h> -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/uio.h> #include <sys/kernel.h> #include <sys/syslog.h> diff --git a/sys/dev/si/si.c b/sys/dev/si/si.c index c2ae76c..0fa4bfb 100644 --- a/sys/dev/si/si.c +++ b/sys/dev/si/si.c @@ -30,7 +30,7 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN * NO EVENT SHALL THE AUTHORS BE LIABLE. * - * $Id$ + * $Id: si.c,v 1.55 1997/02/22 09:37:06 peter Exp $ */ #ifndef lint @@ -46,7 +46,7 @@ static const char si_copyright1[] = "@(#) (C) Specialix International, 1990,199 #include <sys/ttydefaults.h> #include <sys/proc.h> #include <sys/conf.h> -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/uio.h> #include <sys/dkstat.h> #include <sys/kernel.h> diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c index 0c835f0..896812e 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$ + * $Id: sio.c,v 1.159 1997/02/22 09:37:09 peter Exp $ */ #include "opt_comconsole.h" @@ -56,7 +56,7 @@ #include <sys/proc.h> #include <sys/conf.h> #include <sys/dkstat.h> -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/uio.h> #include <sys/kernel.h> #include <sys/malloc.h> diff --git a/sys/dev/snp/snp.c b/sys/dev/snp/snp.c index 0e14b60..fbb6f91 100644 --- a/sys/dev/snp/snp.c +++ b/sys/dev/snp/snp.c @@ -23,7 +23,7 @@ #include <sys/ioctl_compat.h> /* Oooh..We need O/NTTYDISC */ #include <sys/proc.h> #include <sys/tty.h> -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/conf.h> #include <sys/uio.h> #include <sys/kernel.h> diff --git a/sys/dev/vn/vn.c b/sys/dev/vn/vn.c index e1011ff..f2936c9 100644 --- a/sys/dev/vn/vn.c +++ b/sys/dev/vn/vn.c @@ -38,7 +38,7 @@ * from: Utah Hdr: vn.c 1.13 94/04/02 * * from: @(#)vn.c 8.6 (Berkeley) 4/1/94 - * $Id$ + * $Id: vn.c,v 1.44 1997/02/22 09:28:58 peter Exp $ */ /* @@ -79,7 +79,7 @@ #include <sys/ioctl.h> #include <sys/mount.h> #include <sys/vnode.h> -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/uio.h> #include <sys/disklabel.h> #include <sys/diskslice.h> diff --git a/sys/fs/cd9660/cd9660_vfsops.c b/sys/fs/cd9660/cd9660_vfsops.c index 8ee2b8e..5c2bf7c 100644 --- a/sys/fs/cd9660/cd9660_vfsops.c +++ b/sys/fs/cd9660/cd9660_vfsops.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)cd9660_vfsops.c 8.18 (Berkeley) 5/22/95 - * $Id$ + * $Id: cd9660_vfsops.c,v 1.19 1997/02/22 09:38:50 peter Exp $ */ #include <sys/param.h> @@ -48,7 +48,7 @@ #include <miscfs/specfs/specdev.h> #include <sys/mount.h> #include <sys/buf.h> -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/ioctl.h> #include <sys/errno.h> #include <sys/malloc.h> diff --git a/sys/fs/fifofs/fifo_vnops.c b/sys/fs/fifofs/fifo_vnops.c index 599697c..683c10b 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$ + * $Id: fifo_vnops.c,v 1.22 1997/02/22 09:40:17 peter Exp $ */ #include <sys/param.h> @@ -46,6 +46,7 @@ #include <sys/socketvar.h> #include <sys/stat.h> #include <sys/ioctl.h> +#include <sys/fcntl.h> #include <sys/file.h> #include <sys/errno.h> #include <sys/malloc.h> diff --git a/sys/fs/msdosfs/msdosfs_vfsops.c b/sys/fs/msdosfs/msdosfs_vfsops.c index cf37d4d..896c4f0 100644 --- a/sys/fs/msdosfs/msdosfs_vfsops.c +++ b/sys/fs/msdosfs/msdosfs_vfsops.c @@ -1,4 +1,4 @@ -/* $Id: msdosfs_vfsops.c,v 1.17 1997/02/26 14:23:14 bde Exp $ */ +/* $Id: msdosfs_vfsops.c,v 1.18 1997/03/18 19:50:10 peter Exp $ */ /* $NetBSD: msdosfs_vfsops.c,v 1.19 1994/08/21 18:44:10 ws Exp $ */ /*- @@ -57,7 +57,7 @@ #include <miscfs/specfs/specdev.h> /* XXX */ /* defines v_rdev */ #include <sys/mount.h> #include <sys/buf.h> -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/malloc.h> #include <msdosfs/bpb.h> diff --git a/sys/fs/portalfs/portal_vnops.c b/sys/fs/portalfs/portal_vnops.c index c46668f..b8118a8 100644 --- a/sys/fs/portalfs/portal_vnops.c +++ b/sys/fs/portalfs/portal_vnops.c @@ -35,7 +35,7 @@ * * @(#)portal_vnops.c 8.14 (Berkeley) 5/21/95 * - * $Id$ + * $Id: portal_vnops.c,v 1.17 1997/02/22 09:40:25 peter Exp $ */ /* @@ -52,6 +52,7 @@ #include <sys/filedesc.h> #include <sys/unistd.h> #include <sys/vnode.h> +#include <sys/fcntl.h> #include <sys/file.h> #include <sys/stat.h> #include <sys/mount.h> diff --git a/sys/fs/unionfs/union_subr.c b/sys/fs/unionfs/union_subr.c index 063cd44d..a437b54 100644 --- a/sys/fs/unionfs/union_subr.c +++ b/sys/fs/unionfs/union_subr.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * @(#)union_subr.c 8.20 (Berkeley) 5/20/95 - * $Id$ + * $Id: union_subr.c,v 1.14 1997/02/22 09:40:40 peter Exp $ */ #include <sys/param.h> @@ -45,7 +45,7 @@ #include <sys/vnode.h> #include <sys/namei.h> #include <sys/malloc.h> -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/filedesc.h> #include <sys/queue.h> #include <sys/mount.h> diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c index ae6a712..7909706 100644 --- a/sys/fs/unionfs/union_vnops.c +++ b/sys/fs/unionfs/union_vnops.c @@ -35,13 +35,13 @@ * SUCH DAMAGE. * * @(#)union_vnops.c 8.32 (Berkeley) 6/23/95 - * $Id$ + * $Id: union_vnops.c,v 1.19 1997/02/22 09:40:42 peter Exp $ */ #include <sys/param.h> #include <sys/systm.h> #include <sys/proc.h> -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/time.h> #include <sys/stat.h> #include <sys/types.h> diff --git a/sys/gnu/ext2fs/ext2_vfsops.c b/sys/gnu/ext2fs/ext2_vfsops.c index f01c059..3330a22 100644 --- a/sys/gnu/ext2fs/ext2_vfsops.c +++ b/sys/gnu/ext2fs/ext2_vfsops.c @@ -55,7 +55,7 @@ #include <sys/mount.h> #include <sys/buf.h> #include <sys/mbuf.h> -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/disklabel.h> #include <sys/ioctl.h> #include <sys/errno.h> diff --git a/sys/gnu/fs/ext2fs/ext2_vfsops.c b/sys/gnu/fs/ext2fs/ext2_vfsops.c index f01c059..3330a22 100644 --- a/sys/gnu/fs/ext2fs/ext2_vfsops.c +++ b/sys/gnu/fs/ext2fs/ext2_vfsops.c @@ -55,7 +55,7 @@ #include <sys/mount.h> #include <sys/buf.h> #include <sys/mbuf.h> -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/disklabel.h> #include <sys/ioctl.h> #include <sys/errno.h> diff --git a/sys/gnu/i386/isa/dgb.c b/sys/gnu/i386/isa/dgb.c index af4fcc2..10f7728 100644 --- a/sys/gnu/i386/isa/dgb.c +++ b/sys/gnu/i386/isa/dgb.c @@ -1,5 +1,5 @@ /*- - * dgb.c $Id$ + * dgb.c $Id: dgb.c,v 1.23 1997/02/22 09:29:42 peter Exp $ * * Digiboard driver. * @@ -50,7 +50,7 @@ #include <sys/proc.h> #include <sys/conf.h> #include <sys/dkstat.h> -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/uio.h> #include <sys/kernel.h> #include <sys/sysctl.h> diff --git a/sys/i386/ibcs2/ibcs2_fcntl.c b/sys/i386/ibcs2/ibcs2_fcntl.c index a53f282..ca25ea1 100644 --- a/sys/i386/ibcs2/ibcs2_fcntl.c +++ b/sys/i386/ibcs2/ibcs2_fcntl.c @@ -24,13 +24,14 @@ * (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_fcntl.c,v 1.6 1997/02/22 09:33:18 peter Exp $ */ #include <sys/param.h> #include <sys/systm.h> #include <sys/namei.h> #include <sys/proc.h> +#include <sys/fcntl.h> #include <sys/file.h> #include <sys/stat.h> #include <sys/filedesc.h> diff --git a/sys/i386/ibcs2/ibcs2_ioctl.c b/sys/i386/ibcs2/ibcs2_ioctl.c index 082d608..6093845 100644 --- a/sys/i386/ibcs2/ibcs2_ioctl.c +++ b/sys/i386/ibcs2/ibcs2_ioctl.c @@ -31,6 +31,7 @@ #include <sys/namei.h> #include <sys/dir.h> #include <sys/proc.h> +#include <sys/fcntl.h> #include <sys/file.h> #include <sys/stat.h> #include <sys/filedesc.h> diff --git a/sys/i386/ibcs2/ibcs2_misc.c b/sys/i386/ibcs2/ibcs2_misc.c index 321d0fa..aa5e1d8 100644 --- a/sys/i386/ibcs2/ibcs2_misc.c +++ b/sys/i386/ibcs2/ibcs2_misc.c @@ -45,7 +45,7 @@ * * @(#)sun_misc.c 8.1 (Berkeley) 6/18/93 * - * $Id$ + * $Id: ibcs2_misc.c,v 1.16 1997/02/22 09:33:22 peter Exp $ */ /* @@ -58,6 +58,7 @@ #include <sys/systm.h> #include <sys/namei.h> #include <sys/proc.h> +#include <sys/fcntl.h> #include <sys/file.h> #include <sys/filedesc.h> #include <sys/ioctl.h> diff --git a/sys/i386/ibcs2/imgact_coff.c b/sys/i386/ibcs2/imgact_coff.c index 34850b5..e4ee8cc 100644 --- a/sys/i386/ibcs2/imgact_coff.c +++ b/sys/i386/ibcs2/imgact_coff.c @@ -26,7 +26,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: imgact_coff.c,v 1.21 1997/02/22 09:33:30 peter Exp $ */ #include <sys/param.h> @@ -36,7 +36,7 @@ #include <sys/mman.h> #include <sys/imgact.h> #include <sys/kernel.h> -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/malloc.h> #include <sys/mount.h> #include <sys/namei.h> diff --git a/sys/i386/isa/cx.c b/sys/i386/isa/cx.c index cc9b3b9..0893b05c 100644 --- a/sys/i386/isa/cx.c +++ b/sys/i386/isa/cx.c @@ -25,7 +25,7 @@ #include <sys/kernel.h> #include <sys/mbuf.h> #include <sys/ioctl.h> -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/conf.h> #include <sys/proc.h> #include <sys/tty.h> diff --git a/sys/i386/isa/cy.c b/sys/i386/isa/cy.c index 1bbc540..54443dc 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$ + * $Id: cy.c,v 1.45 1997/02/22 09:36:03 peter Exp $ */ #include "cy.h" @@ -76,7 +76,7 @@ #include <sys/proc.h> #include <sys/conf.h> #include <sys/dkstat.h> -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/uio.h> #include <sys/kernel.h> #include <sys/malloc.h> diff --git a/sys/i386/isa/fd.c b/sys/i386/isa/fd.c index e08c637..b18ad71 100644 --- a/sys/i386/isa/fd.c +++ b/sys/i386/isa/fd.c @@ -43,7 +43,7 @@ * SUCH DAMAGE. * * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 - * $Id$ + * $Id: fd.c,v 1.97 1997/02/22 09:36:09 peter Exp $ * */ @@ -59,7 +59,7 @@ #include <sys/systm.h> #include <sys/kernel.h> #include <sys/conf.h> -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/ioctl.h> #include <machine/clock.h> #include <machine/ioctl_fd.h> diff --git a/sys/i386/isa/istallion.c b/sys/i386/isa/istallion.c index 186fafc..314cad0 100644 --- a/sys/i386/isa/istallion.c +++ b/sys/i386/isa/istallion.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: istallion.c,v 1.8 1997/02/22 09:36:43 peter Exp $ + * $Id: istallion.c,v 1.9 1997/03/13 03:51:25 davidn Exp $ */ /*****************************************************************************/ @@ -48,7 +48,7 @@ #include <sys/tty.h> #include <sys/proc.h> #include <sys/conf.h> -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/uio.h> #include <sys/syslog.h> #include <machine/cpu.h> diff --git a/sys/i386/isa/matcd/matcd.c b/sys/i386/isa/matcd/matcd.c index f256d44..5ee59da 100644 --- a/sys/i386/isa/matcd/matcd.c +++ b/sys/i386/isa/matcd/matcd.c @@ -337,7 +337,7 @@ static char MATCDVERSION[]="Version 1(26) 18-Oct-95"; static char MATCDCOPYRIGHT[] = "Matsushita CD-ROM driver, Copr. 1994,1995 Frank Durda IV"; /* The proceeding strings may not be changed*/ -/* $Id$ */ +/* $Id: matcd.c,v 1.22 1997/02/22 09:38:11 peter Exp $ */ /*--------------------------------------------------------------------------- Include declarations @@ -351,7 +351,7 @@ static char MATCDCOPYRIGHT[] = "Matsushita CD-ROM driver, Copr. 1994,1995 Frank #include <sys/dkbad.h> #include <sys/cdio.h> #include <sys/disklabel.h> -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/ioctl.h> #include <sys/proc.h> diff --git a/sys/i386/isa/mcd.c b/sys/i386/isa/mcd.c index 4fa6086..d48add7 100644 --- a/sys/i386/isa/mcd.c +++ b/sys/i386/isa/mcd.c @@ -40,7 +40,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$ + * $Id: mcd.c,v 1.85 1997/02/22 09:36:53 peter Exp $ */ static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore"; @@ -50,7 +50,7 @@ static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore"; #include <sys/param.h> #include <sys/systm.h> #include <sys/conf.h> -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/buf.h> #include <sys/proc.h> #include <sys/stat.h> diff --git a/sys/i386/isa/psm.c b/sys/i386/isa/psm.c index ea3e224..ffb5caa 100644 --- a/sys/i386/isa/psm.c +++ b/sys/i386/isa/psm.c @@ -19,7 +19,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$ + * $Id: psm.c,v 1.37 1997/02/22 09:37:01 peter Exp $ */ /* @@ -66,7 +66,7 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/proc.h> #include <sys/conf.h> #include <sys/syslog.h> diff --git a/sys/i386/isa/rc.c b/sys/i386/isa/rc.c index 677ae14..5a2ce2c 100644 --- a/sys/i386/isa/rc.c +++ b/sys/i386/isa/rc.c @@ -44,7 +44,7 @@ #include <sys/proc.h> #include <sys/conf.h> #include <sys/dkstat.h> -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/uio.h> #include <sys/kernel.h> #include <sys/syslog.h> diff --git a/sys/i386/isa/si.c b/sys/i386/isa/si.c index c2ae76c..0fa4bfb 100644 --- a/sys/i386/isa/si.c +++ b/sys/i386/isa/si.c @@ -30,7 +30,7 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN * NO EVENT SHALL THE AUTHORS BE LIABLE. * - * $Id$ + * $Id: si.c,v 1.55 1997/02/22 09:37:06 peter Exp $ */ #ifndef lint @@ -46,7 +46,7 @@ static const char si_copyright1[] = "@(#) (C) Specialix International, 1990,199 #include <sys/ttydefaults.h> #include <sys/proc.h> #include <sys/conf.h> -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/uio.h> #include <sys/dkstat.h> #include <sys/kernel.h> diff --git a/sys/i386/isa/sio.c b/sys/i386/isa/sio.c index 0c835f0..896812e 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$ + * $Id: sio.c,v 1.159 1997/02/22 09:37:09 peter Exp $ */ #include "opt_comconsole.h" @@ -56,7 +56,7 @@ #include <sys/proc.h> #include <sys/conf.h> #include <sys/dkstat.h> -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/uio.h> #include <sys/kernel.h> #include <sys/malloc.h> diff --git a/sys/i386/isa/sound/os.h b/sys/i386/isa/sound/os.h index 5b233b5..9ee44a1 100644 --- a/sys/i386/isa/sound/os.h +++ b/sys/i386/isa/sound/os.h @@ -23,7 +23,7 @@ #include <sys/systm.h> #include <sys/proc.h> #include <sys/conf.h> -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/filio.h> #include <sys/uio.h> #include <sys/kernel.h> diff --git a/sys/i386/isa/stallion.c b/sys/i386/isa/stallion.c index 10ed5e2..b4aea0b 100644 --- a/sys/i386/isa/stallion.c +++ b/sys/i386/isa/stallion.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: stallion.c,v 1.6 1997/02/22 09:37:13 peter Exp $ + * $Id: stallion.c,v 1.7 1997/03/13 04:13:45 davidn Exp $ */ /*****************************************************************************/ @@ -48,7 +48,7 @@ #include <sys/tty.h> #include <sys/proc.h> #include <sys/conf.h> -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/uio.h> #include <sys/syslog.h> #include <machine/cpu.h> diff --git a/sys/i386/linux/linux_ioctl.c b/sys/i386/linux/linux_ioctl.c index c2e8780..75bf626 100644 --- a/sys/i386/linux/linux_ioctl.c +++ b/sys/i386/linux/linux_ioctl.c @@ -25,7 +25,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: linux_ioctl.c,v 1.14 1997/02/22 09:38:21 peter Exp $ */ #include <sys/param.h> @@ -34,6 +34,7 @@ #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/tty.h> diff --git a/sys/i386/linux/linux_misc.c b/sys/i386/linux/linux_misc.c index 0fb8085..706e83d 100644 --- a/sys/i386/linux/linux_misc.c +++ b/sys/i386/linux/linux_misc.c @@ -25,7 +25,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: linux_misc.c,v 1.24 1997/02/22 09:38:23 peter Exp $ */ #include <sys/param.h> @@ -36,7 +36,7 @@ #include <sys/mman.h> #include <sys/proc.h> #include <sys/dirent.h> -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/filedesc.h> #include <sys/ioctl.h> #include <sys/imgact_aout.h> diff --git a/sys/isa/fd.c b/sys/isa/fd.c index e08c637..b18ad71 100644 --- a/sys/isa/fd.c +++ b/sys/isa/fd.c @@ -43,7 +43,7 @@ * SUCH DAMAGE. * * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 - * $Id$ + * $Id: fd.c,v 1.97 1997/02/22 09:36:09 peter Exp $ * */ @@ -59,7 +59,7 @@ #include <sys/systm.h> #include <sys/kernel.h> #include <sys/conf.h> -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/ioctl.h> #include <machine/clock.h> #include <machine/ioctl_fd.h> diff --git a/sys/isa/sio.c b/sys/isa/sio.c index 0c835f0..896812e 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$ + * $Id: sio.c,v 1.159 1997/02/22 09:37:09 peter Exp $ */ #include "opt_comconsole.h" @@ -56,7 +56,7 @@ #include <sys/proc.h> #include <sys/conf.h> #include <sys/dkstat.h> -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/uio.h> #include <sys/kernel.h> #include <sys/malloc.h> diff --git a/sys/isofs/cd9660/cd9660_vfsops.c b/sys/isofs/cd9660/cd9660_vfsops.c index 8ee2b8e..5c2bf7c 100644 --- a/sys/isofs/cd9660/cd9660_vfsops.c +++ b/sys/isofs/cd9660/cd9660_vfsops.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)cd9660_vfsops.c 8.18 (Berkeley) 5/22/95 - * $Id$ + * $Id: cd9660_vfsops.c,v 1.19 1997/02/22 09:38:50 peter Exp $ */ #include <sys/param.h> @@ -48,7 +48,7 @@ #include <miscfs/specfs/specdev.h> #include <sys/mount.h> #include <sys/buf.h> -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/ioctl.h> #include <sys/errno.h> #include <sys/malloc.h> diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c index 5867fde..525d76d 100644 --- a/sys/kern/imgact_elf.c +++ b/sys/kern/imgact_elf.c @@ -26,7 +26,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: imgact_elf.c,v 1.16 1997/02/22 09:38:56 peter Exp $ */ #include "opt_rlimit.h" @@ -40,7 +40,7 @@ #include <sys/imgact_elf.h> #include <sys/kernel.h> #include <sys/sysent.h> -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/malloc.h> #include <sys/mount.h> #include <sys/namei.h> diff --git a/sys/kern/kern_acct.c b/sys/kern/kern_acct.c index 662562b..fbbe6f4 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$ + * $Id: kern_acct.c,v 1.13 1997/02/22 09:39:00 peter Exp $ */ #include <sys/param.h> @@ -46,7 +46,7 @@ #include <sys/proc.h> #include <sys/mount.h> #include <sys/vnode.h> -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/syslog.h> #include <sys/kernel.h> #include <sys/sysent.h> diff --git a/sys/kern/kern_ktrace.c b/sys/kern/kern_ktrace.c index b2f73ed..f8e4e25 100644 --- a/sys/kern/kern_ktrace.c +++ b/sys/kern/kern_ktrace.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)kern_ktrace.c 8.2 (Berkeley) 9/23/93 - * $Id$ + * $Id: kern_ktrace.c,v 1.17 1997/02/22 09:39:05 peter Exp $ */ #include "opt_ktrace.h" @@ -40,7 +40,7 @@ #include <sys/systm.h> #include <sys/sysproto.h> #include <sys/proc.h> -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/namei.h> #include <sys/vnode.h> #include <sys/ktrace.h> diff --git a/sys/kern/kern_lkm.c b/sys/kern/kern_lkm.c index 19e0290..16fd67b 100644 --- a/sys/kern/kern_lkm.c +++ b/sys/kern/kern_lkm.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: kern_lkm.c,v 1.36 1997/02/22 09:39:06 peter Exp $ + * $Id: kern_lkm.c,v 1.37 1997/02/27 16:40:20 bde Exp $ */ #include <sys/param.h> @@ -39,7 +39,7 @@ #include <sys/ioctl.h> #include <sys/tty.h> #include <sys/conf.h> -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/proc.h> #include <sys/uio.h> #include <sys/kernel.h> diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index 772e054..e0b28e0 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_sig.c 8.7 (Berkeley) 4/18/94 - * $Id$ + * $Id: kern_sig.c,v 1.30 1997/02/22 09:39:11 peter Exp $ */ #include "opt_ktrace.h" @@ -54,7 +54,7 @@ #include <sys/times.h> #include <sys/buf.h> #include <sys/acct.h> -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/kernel.h> #include <sys/wait.h> #include <sys/ktrace.h> diff --git a/sys/kern/subr_log.c b/sys/kern/subr_log.c index d76bd6c..a2d31dd 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$ + * $Id: subr_log.c,v 1.20 1997/02/22 09:39:16 peter Exp $ */ /* @@ -45,7 +45,7 @@ #include <sys/vnode.h> #include <sys/ioctl.h> #include <sys/msgbuf.h> -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/signalvar.h> #include <sys/kernel.h> #ifdef DEVFS diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c index 67ac7c5..5bbb3f1 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.23 1997/02/22 09:39:19 peter Exp $ + * $Id: sys_generic.c,v 1.24 1997/03/22 08:03:36 bde Exp $ */ #include "opt_ktrace.h" @@ -46,6 +46,7 @@ #include <sys/sysproto.h> #include <sys/filedesc.h> #include <sys/ioctl.h> +#include <sys/fcntl.h> #include <sys/file.h> #include <sys/proc.h> #include <sys/stat.h> diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c index 66b0ac7..71bbed0 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.24 1997/02/22 09:39:19 peter Exp $ + * $Id: sys_pipe.c,v 1.25 1997/03/22 06:52:57 bde Exp $ */ #ifndef OLD_PIPE @@ -54,6 +54,7 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/proc.h> +#include <sys/fcntl.h> #include <sys/file.h> #include <sys/protosw.h> #include <sys/stat.h> diff --git a/sys/kern/sys_socket.c b/sys/kern/sys_socket.c index eab70de..f8b027d 100644 --- a/sys/kern/sys_socket.c +++ b/sys/kern/sys_socket.c @@ -31,13 +31,14 @@ * SUCH DAMAGE. * * @(#)sys_socket.c 8.1 (Berkeley) 6/10/93 - * $Id$ + * $Id: sys_socket.c,v 1.10 1997/02/22 09:39:20 peter Exp $ */ #include <sys/param.h> #include <sys/queue.h> #include <sys/systm.h> #include <sys/proc.h> +#include <sys/fcntl.h> #include <sys/file.h> #include <sys/mbuf.h> #include <sys/protosw.h> diff --git a/sys/kern/tty.c b/sys/kern/tty.c index a1e516d..e598206 100644 --- a/sys/kern/tty.c +++ b/sys/kern/tty.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)tty.c 8.8 (Berkeley) 1/21/94 - * $Id: tty.c,v 1.91 1997/02/22 09:39:23 peter Exp $ + * $Id: tty.c,v 1.92 1997/03/22 06:52:58 bde Exp $ */ /*- @@ -77,7 +77,7 @@ #define TTYDEFCHARS #include <sys/tty.h> #undef TTYDEFCHARS -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/conf.h> #include <sys/dkstat.h> #include <sys/uio.h> diff --git a/sys/kern/tty_pty.c b/sys/kern/tty_pty.c index c72c15f..6326fda 100644 --- a/sys/kern/tty_pty.c +++ b/sys/kern/tty_pty.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tty_pty.c 8.4 (Berkeley) 2/20/95 - * $Id$ + * $Id: tty_pty.c,v 1.41 1997/02/22 09:39:25 peter Exp $ */ /* @@ -46,7 +46,7 @@ #include <sys/proc.h> #include <sys/tty.h> #include <sys/conf.h> -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/uio.h> #include <sys/kernel.h> #include <sys/vnode.h> diff --git a/sys/kern/tty_snoop.c b/sys/kern/tty_snoop.c index 0e14b60..fbb6f91 100644 --- a/sys/kern/tty_snoop.c +++ b/sys/kern/tty_snoop.c @@ -23,7 +23,7 @@ #include <sys/ioctl_compat.h> /* Oooh..We need O/NTTYDISC */ #include <sys/proc.h> #include <sys/tty.h> -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/conf.h> #include <sys/uio.h> #include <sys/kernel.h> diff --git a/sys/kern/tty_tty.c b/sys/kern/tty_tty.c index 40e5baf..b1acc26 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$ + * $Id: tty_tty.c,v 1.14 1997/02/22 09:39:27 peter Exp $ */ /* @@ -44,7 +44,7 @@ #include <sys/proc.h> #include <sys/tty.h> #include <sys/vnode.h> -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/kernel.h> #ifdef DEVFS #include <sys/devfsext.h> diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 7fdfca8..9f70207 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -31,14 +31,14 @@ * SUCH DAMAGE. * * @(#)uipc_socket.c 8.3 (Berkeley) 4/15/94 - * $Id: uipc_socket.c,v 1.23 1997/02/22 09:39:28 peter Exp $ + * $Id: uipc_socket.c,v 1.24 1997/02/24 20:30:56 wollman Exp $ */ #include <sys/param.h> #include <sys/queue.h> #include <sys/systm.h> #include <sys/proc.h> -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/malloc.h> #include <sys/mbuf.h> #include <sys/domain.h> diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c index 756e960..e3aca30 100644 --- a/sys/kern/uipc_syscalls.c +++ b/sys/kern/uipc_syscalls.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)uipc_syscalls.c 8.4 (Berkeley) 2/21/94 - * $Id$ + * $Id: uipc_syscalls.c,v 1.22 1997/02/22 09:39:29 peter Exp $ */ #include "opt_ktrace.h" @@ -41,6 +41,7 @@ #include <sys/sysproto.h> #include <sys/filedesc.h> #include <sys/proc.h> +#include <sys/fcntl.h> #include <sys/file.h> #include <sys/buf.h> #include <sys/malloc.h> diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 3c68f05..0a47414 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * From: @(#)uipc_usrreq.c 8.3 (Berkeley) 1/4/94 - * $Id: uipc_usrreq.c,v 1.20 1997/02/24 20:30:58 wollman Exp $ + * $Id: uipc_usrreq.c,v 1.21 1997/03/21 16:12:32 wpaul Exp $ */ #include <sys/param.h> @@ -39,6 +39,7 @@ #include <sys/systm.h> #include <sys/kernel.h> #include <sys/domain.h> +#include <sys/fcntl.h> #include <sys/file.h> #include <sys/filedesc.h> #include <sys/mbuf.h> diff --git a/sys/kern/vfs_extattr.c b/sys/kern/vfs_extattr.c index 26e9867..6404a8c 100644 --- a/sys/kern/vfs_extattr.c +++ b/sys/kern/vfs_extattr.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_syscalls.c 8.13 (Berkeley) 4/15/94 - * $Id: vfs_syscalls.c,v 1.58 1997/02/22 09:39:35 peter Exp $ + * $Id: vfs_syscalls.c,v 1.59 1997/03/05 01:42:14 msmith Exp $ */ /* @@ -55,6 +55,7 @@ #include <sys/namei.h> #include <sys/filedesc.h> #include <sys/kernel.h> +#include <sys/fcntl.h> #include <sys/file.h> #include <sys/stat.h> #include <sys/unistd.h> diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c index 26e9867..6404a8c 100644 --- a/sys/kern/vfs_syscalls.c +++ b/sys/kern/vfs_syscalls.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_syscalls.c 8.13 (Berkeley) 4/15/94 - * $Id: vfs_syscalls.c,v 1.58 1997/02/22 09:39:35 peter Exp $ + * $Id: vfs_syscalls.c,v 1.59 1997/03/05 01:42:14 msmith Exp $ */ /* @@ -55,6 +55,7 @@ #include <sys/namei.h> #include <sys/filedesc.h> #include <sys/kernel.h> +#include <sys/fcntl.h> #include <sys/file.h> #include <sys/stat.h> #include <sys/unistd.h> diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index 31d2c23..431913f 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -36,12 +36,13 @@ * SUCH DAMAGE. * * @(#)vfs_vnops.c 8.2 (Berkeley) 1/21/94 - * $Id: vfs_vnops.c,v 1.31 1997/03/07 07:42:41 gpalmer Exp $ + * $Id: vfs_vnops.c,v 1.32 1997/03/08 15:14:30 guido Exp $ */ #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> +#include <sys/fcntl.h> #include <sys/file.h> #include <sys/stat.h> #include <sys/buf.h> diff --git a/sys/miscfs/fifofs/fifo_vnops.c b/sys/miscfs/fifofs/fifo_vnops.c index 599697c..683c10b 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$ + * $Id: fifo_vnops.c,v 1.22 1997/02/22 09:40:17 peter Exp $ */ #include <sys/param.h> @@ -46,6 +46,7 @@ #include <sys/socketvar.h> #include <sys/stat.h> #include <sys/ioctl.h> +#include <sys/fcntl.h> #include <sys/file.h> #include <sys/errno.h> #include <sys/malloc.h> diff --git a/sys/miscfs/portal/portal_vnops.c b/sys/miscfs/portal/portal_vnops.c index c46668f..b8118a8 100644 --- a/sys/miscfs/portal/portal_vnops.c +++ b/sys/miscfs/portal/portal_vnops.c @@ -35,7 +35,7 @@ * * @(#)portal_vnops.c 8.14 (Berkeley) 5/21/95 * - * $Id$ + * $Id: portal_vnops.c,v 1.17 1997/02/22 09:40:25 peter Exp $ */ /* @@ -52,6 +52,7 @@ #include <sys/filedesc.h> #include <sys/unistd.h> #include <sys/vnode.h> +#include <sys/fcntl.h> #include <sys/file.h> #include <sys/stat.h> #include <sys/mount.h> diff --git a/sys/miscfs/union/union_subr.c b/sys/miscfs/union/union_subr.c index 063cd44d..a437b54 100644 --- a/sys/miscfs/union/union_subr.c +++ b/sys/miscfs/union/union_subr.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * @(#)union_subr.c 8.20 (Berkeley) 5/20/95 - * $Id$ + * $Id: union_subr.c,v 1.14 1997/02/22 09:40:40 peter Exp $ */ #include <sys/param.h> @@ -45,7 +45,7 @@ #include <sys/vnode.h> #include <sys/namei.h> #include <sys/malloc.h> -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/filedesc.h> #include <sys/queue.h> #include <sys/mount.h> diff --git a/sys/miscfs/union/union_vnops.c b/sys/miscfs/union/union_vnops.c index ae6a712..7909706 100644 --- a/sys/miscfs/union/union_vnops.c +++ b/sys/miscfs/union/union_vnops.c @@ -35,13 +35,13 @@ * SUCH DAMAGE. * * @(#)union_vnops.c 8.32 (Berkeley) 6/23/95 - * $Id$ + * $Id: union_vnops.c,v 1.19 1997/02/22 09:40:42 peter Exp $ */ #include <sys/param.h> #include <sys/systm.h> #include <sys/proc.h> -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/time.h> #include <sys/stat.h> #include <sys/types.h> diff --git a/sys/msdosfs/msdosfs_vfsops.c b/sys/msdosfs/msdosfs_vfsops.c index cf37d4d..896c4f0 100644 --- a/sys/msdosfs/msdosfs_vfsops.c +++ b/sys/msdosfs/msdosfs_vfsops.c @@ -1,4 +1,4 @@ -/* $Id: msdosfs_vfsops.c,v 1.17 1997/02/26 14:23:14 bde Exp $ */ +/* $Id: msdosfs_vfsops.c,v 1.18 1997/03/18 19:50:10 peter Exp $ */ /* $NetBSD: msdosfs_vfsops.c,v 1.19 1994/08/21 18:44:10 ws Exp $ */ /*- @@ -57,7 +57,7 @@ #include <miscfs/specfs/specdev.h> /* XXX */ /* defines v_rdev */ #include <sys/mount.h> #include <sys/buf.h> -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/malloc.h> #include <msdosfs/bpb.h> diff --git a/sys/net/bpf.c b/sys/net/bpf.c index ffd4e30..db05aed 100644 --- a/sys/net/bpf.c +++ b/sys/net/bpf.c @@ -37,7 +37,7 @@ * * @(#)bpf.c 8.2 (Berkeley) 3/28/94 * - * $Id$ + * $Id: bpf.c,v 1.29 1997/02/22 09:40:52 peter Exp $ */ #include "bpfilter.h" @@ -60,7 +60,7 @@ #include <sys/signalvar.h> #include <sys/ioctl.h> -#include <sys/file.h> +#include <sys/fcntl.h> #if defined(sparc) && BSD < 199103 #include <sys/stream.h> #endif diff --git a/sys/net/if_sl.c b/sys/net/if_sl.c index 79f0c66..3fa5e8a 100644 --- a/sys/net/if_sl.c +++ b/sys/net/if_sl.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)if_sl.c 8.6 (Berkeley) 2/1/94 - * $Id: if_sl.c,v 1.49 1997/02/22 09:41:06 peter Exp $ + * $Id: if_sl.c,v 1.50 1997/03/11 19:39:21 bde Exp $ */ /* @@ -78,7 +78,7 @@ #include <sys/dkstat.h> #include <sys/socket.h> #include <sys/ioctl.h> -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/signalvar.h> #include <sys/tty.h> #include <sys/clist.h> diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c index 985afc4..c58e265 100644 --- a/sys/net/if_tun.c +++ b/sys/net/if_tun.c @@ -28,7 +28,7 @@ #include <sys/errno.h> #include <sys/syslog.h> #include <sys/select.h> -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/signalvar.h> #include <sys/kernel.h> #include <sys/sysctl.h> diff --git a/sys/net/ppp_tty.c b/sys/net/ppp_tty.c index c9c9428..f1c9e07 100644 --- a/sys/net/ppp_tty.c +++ b/sys/net/ppp_tty.c @@ -70,7 +70,7 @@ * Paul Mackerras (paulus@cs.anu.edu.au). */ -/* $Id$ */ +/* $Id: ppp_tty.c,v 1.13 1997/02/22 09:41:11 peter Exp $ */ /* from Id: ppp_tty.c,v 1.3 1995/08/16 01:36:40 paulus Exp */ /* from if_sl.c,v 1.11 84/10/04 12:54:47 rick Exp */ @@ -87,7 +87,7 @@ #include <sys/dkstat.h> #include <sys/socket.h> #include <sys/ioctl.h> -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/tty.h> #include <sys/kernel.h> #include <sys/conf.h> diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c index 7a2b049..4da890a 100644 --- a/sys/scsi/cd.c +++ b/sys/scsi/cd.c @@ -14,7 +14,7 @@ * * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992 * - * $Id$ + * $Id: cd.c,v 1.78 1997/02/22 09:44:23 peter Exp $ */ #include "opt_bounce.h" @@ -27,7 +27,7 @@ #include <sys/dkbad.h> #include <sys/systm.h> #include <sys/conf.h> -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/stat.h> #include <sys/ioctl.h> #include <sys/buf.h> diff --git a/sys/sys/file.h b/sys/sys/file.h index 0d9f83c..5a53ed7 100644 --- a/sys/sys/file.h +++ b/sys/sys/file.h @@ -31,14 +31,14 @@ * SUCH DAMAGE. * * @(#)file.h 8.3 (Berkeley) 1/9/95 - * $Id$ + * $Id: file.h,v 1.12 1997/02/22 09:45:14 peter Exp $ */ #ifndef _SYS_FILE_H_ #define _SYS_FILE_H_ -#include <sys/fcntl.h> #ifndef KERNEL +#include <sys/fcntl.h> #include <sys/unistd.h> #endif diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c index c63e5b7..6250975 100644 --- a/sys/ufs/ffs/ffs_vfsops.c +++ b/sys/ufs/ffs/ffs_vfsops.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ffs_vfsops.c 8.31 (Berkeley) 5/20/95 - * $Id: ffs_vfsops.c,v 1.48 1997/03/18 19:50:12 peter Exp $ + * $Id: ffs_vfsops.c,v 1.49 1997/03/22 06:53:30 bde Exp $ */ #include "opt_quota.h" @@ -46,7 +46,7 @@ #include <sys/mount.h> #include <sys/buf.h> #include <sys/mbuf.h> -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/disklabel.h> #include <sys/ioctl.h> #include <sys/errno.h> diff --git a/sys/ufs/lfs/lfs_vfsops.c b/sys/ufs/lfs/lfs_vfsops.c index 265a580..0b85cdd 100644 --- a/sys/ufs/lfs/lfs_vfsops.c +++ b/sys/ufs/lfs/lfs_vfsops.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)lfs_vfsops.c 8.20 (Berkeley) 6/10/95 - * $Id: lfs_vfsops.c,v 1.16 1997/02/22 09:47:25 peter Exp $ + * $Id: lfs_vfsops.c,v 1.17 1997/03/23 00:45:23 bde Exp $ */ #include "opt_quota.h" @@ -45,7 +45,7 @@ #include <sys/mount.h> #include <sys/buf.h> #include <sys/mbuf.h> -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/disklabel.h> #include <sys/ioctl.h> #include <sys/errno.h> diff --git a/sys/ufs/ufs/ufs_quota.c b/sys/ufs/ufs/ufs_quota.c index 416df5b..ce9ef41 100644 --- a/sys/ufs/ufs/ufs_quota.c +++ b/sys/ufs/ufs/ufs_quota.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)ufs_quota.c 8.5 (Berkeley) 5/20/95 - * $Id: ufs_quota.c,v 1.11 1997/02/22 09:47:50 peter Exp $ + * $Id: ufs_quota.c,v 1.12 1997/03/09 06:10:34 mpp Exp $ */ #include "opt_quota.h" /* not really necessary... */ @@ -44,7 +44,7 @@ #include <sys/systm.h> #include <sys/namei.h> #include <sys/malloc.h> -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/proc.h> #include <sys/vnode.h> #include <sys/mount.h> diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c index c760938..57e3098 100644 --- a/sys/vm/vm_mmap.c +++ b/sys/vm/vm_mmap.c @@ -38,7 +38,7 @@ * from: Utah $Hdr: vm_mmap.c 1.6 91/10/21$ * * @(#)vm_mmap.c 8.4 (Berkeley) 1/12/94 - * $Id$ + * $Id: vm_mmap.c,v 1.62 1997/02/22 09:48:27 peter Exp $ */ /* @@ -54,6 +54,7 @@ #include <sys/resourcevar.h> #include <sys/proc.h> #include <sys/vnode.h> +#include <sys/fcntl.h> #include <sys/file.h> #include <sys/mman.h> #include <sys/conf.h> diff --git a/sys/vm/vm_swap.c b/sys/vm/vm_swap.c index c43c55f..6082278 100644 --- a/sys/vm/vm_swap.c +++ b/sys/vm/vm_swap.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)vm_swap.c 8.5 (Berkeley) 2/17/94 - * $Id$ + * $Id: vm_swap.c,v 1.42 1997/02/22 09:48:40 peter Exp $ */ #include <sys/param.h> @@ -46,7 +46,7 @@ #include <sys/namei.h> #include <sys/dmap.h> /* XXX */ #include <sys/vnode.h> -#include <sys/file.h> +#include <sys/fcntl.h> #include <sys/rlist.h> #include <sys/kernel.h> #include <vm/vm.h> |