From 4b1f64dcf5feb790aab4be62991acb194f54fcf2 Mon Sep 17 00:00:00 2001
From: guenther <guenther@openbsd.org>
Date: Tue, 2 Jan 2018 06:38:45 +0000
Subject: [PATCH] Stop assuming <sys/file.h> will pull in fcntl.h when _KERNEL
 is defined.

ok millert@ sthen@
---
 lib/libkvm/kvm_file2.c         | 3 ++-
 sys/dev/diskmap.c              | 3 ++-
 sys/kern/exec_script.c         | 3 ++-
 sys/kern/kern_exec.c           | 3 ++-
 sys/kern/kern_sysctl.c         | 3 ++-
 sys/kern/sys_generic.c         | 3 ++-
 sys/kern/sys_pipe.c            | 3 ++-
 sys/kern/tty_pty.c             | 3 ++-
 sys/kern/uipc_syscalls.c       | 3 ++-
 sys/kern/vfs_syscalls.c        | 3 ++-
 sys/kern/vfs_vnops.c           | 3 ++-
 sys/miscfs/fifofs/fifo_vnops.c | 3 ++-
 sys/msdosfs/msdosfs_vnops.c    | 5 +++--
 sys/ufs/ufs/ufs_vnops.c        | 3 ++-
 sys/uvm/uvm_mmap.c             | 3 ++-
 usr.sbin/pstat/pstat.c         | 3 ++-
 16 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/lib/libkvm/kvm_file2.c b/lib/libkvm/kvm_file2.c
index 183ee4e1666..4a9aa7384bc 100644
--- a/lib/libkvm/kvm_file2.c
+++ b/lib/libkvm/kvm_file2.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kvm_file2.c,v 1.52 2017/01/21 05:42:04 guenther Exp $	*/
+/*	$OpenBSD: kvm_file2.c,v 1.53 2018/01/02 06:38:45 guenther Exp $	*/
 
 /*
  * Copyright (c) 2009 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -105,6 +105,7 @@
 #include <netinet6/ip6_var.h>
 #endif
 
+#include <fcntl.h>
 #include <nlist.h>
 #include <kvm.h>
 #include <db.h>
diff --git a/sys/dev/diskmap.c b/sys/dev/diskmap.c
index 4550cffc264..a14f03d4689 100644
--- a/sys/dev/diskmap.c
+++ b/sys/dev/diskmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: diskmap.c,v 1.16 2017/09/08 05:36:52 deraadt Exp $	*/
+/*	$OpenBSD: diskmap.c,v 1.17 2018/01/02 06:38:45 guenther Exp $	*/
 
 /*
  * Copyright (c) 2009, 2010 Joel Sing <jsing@openbsd.org>
@@ -28,6 +28,7 @@
 #include <sys/dkio.h>
 #include <sys/disk.h>
 #include <sys/disklabel.h>
+#include <sys/fcntl.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #include <sys/lock.h>
diff --git a/sys/kern/exec_script.c b/sys/kern/exec_script.c
index b6fd5be23d5..2e51357dbe6 100644
--- a/sys/kern/exec_script.c
+++ b/sys/kern/exec_script.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exec_script.c,v 1.41 2018/01/01 08:55:43 florian Exp $	*/
+/*	$OpenBSD: exec_script.c,v 1.42 2018/01/02 06:38:45 guenther Exp $	*/
 /*	$NetBSD: exec_script.c,v 1.13 1996/02/04 02:15:06 christos Exp $	*/
 
 /*
@@ -39,6 +39,7 @@
 #include <sys/vnode.h>
 #include <sys/lock.h>
 #include <sys/namei.h>
+#include <sys/fcntl.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #include <sys/exec.h>
diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c
index d3b9534f747..7aa601f43a3 100644
--- a/sys/kern/kern_exec.c
+++ b/sys/kern/kern_exec.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_exec.c,v 1.192 2018/01/01 09:01:21 florian Exp $	*/
+/*	$OpenBSD: kern_exec.c,v 1.193 2018/01/02 06:38:45 guenther Exp $	*/
 /*	$NetBSD: kern_exec.c,v 1.75 1996/02/09 18:59:28 christos Exp $	*/
 
 /*-
@@ -43,6 +43,7 @@
 #include <sys/pool.h>
 #include <sys/namei.h>
 #include <sys/vnode.h>
+#include <sys/fcntl.h>
 #include <sys/file.h>
 #include <sys/acct.h>
 #include <sys/exec.h>
diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c
index ae07c12e8e9..08ae58e9a19 100644
--- a/sys/kern/kern_sysctl.c
+++ b/sys/kern/kern_sysctl.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_sysctl.c,v 1.330 2017/08/11 21:24:19 mpi Exp $	*/
+/*	$OpenBSD: kern_sysctl.c,v 1.331 2018/01/02 06:38:45 guenther Exp $	*/
 /*	$NetBSD: kern_sysctl.c,v 1.17 1996/05/20 17:49:05 mrg Exp $	*/
 
 /*-
@@ -47,6 +47,7 @@
 #include <sys/proc.h>
 #include <sys/resourcevar.h>
 #include <sys/signalvar.h>
+#include <sys/fcntl.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #include <sys/vnode.h>
diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c
index 8afc08f8d17..ffd5735cebf 100644
--- a/sys/kern/sys_generic.c
+++ b/sys/kern/sys_generic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sys_generic.c,v 1.115 2017/06/26 09:32:31 mpi Exp $	*/
+/*	$OpenBSD: sys_generic.c,v 1.116 2018/01/02 06:38:45 guenther Exp $	*/
 /*	$NetBSD: sys_generic.c,v 1.24 1996/03/29 00:25:32 cgd Exp $	*/
 
 /*
@@ -42,6 +42,7 @@
 #include <sys/systm.h>
 #include <sys/filedesc.h>
 #include <sys/ioctl.h>
+#include <sys/fcntl.h>
 #include <sys/file.h>
 #include <sys/proc.h>
 #include <sys/resourcevar.h>
diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c
index 57c45d74335..439eec218e0 100644
--- a/sys/kern/sys_pipe.c
+++ b/sys/kern/sys_pipe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sys_pipe.c,v 1.76 2017/02/11 19:51:06 guenther Exp $	*/
+/*	$OpenBSD: sys_pipe.c,v 1.77 2018/01/02 06:38:45 guenther Exp $	*/
 
 /*
  * Copyright (c) 1996 John S. Dyson
@@ -29,6 +29,7 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
+#include <sys/fcntl.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #include <sys/pool.h>
diff --git a/sys/kern/tty_pty.c b/sys/kern/tty_pty.c
index 20dea27e4ed..970cb044942 100644
--- a/sys/kern/tty_pty.c
+++ b/sys/kern/tty_pty.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tty_pty.c,v 1.80 2017/07/04 17:29:51 tedu Exp $	*/
+/*	$OpenBSD: tty_pty.c,v 1.81 2018/01/02 06:38:45 guenther Exp $	*/
 /*	$NetBSD: tty_pty.c,v 1.33.4.1 1996/06/02 09:08:11 mrg Exp $	*/
 
 /*
@@ -44,6 +44,7 @@
 #include <sys/ioctl.h>
 #include <sys/proc.h>
 #include <sys/tty.h>
+#include <sys/fcntl.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #include <sys/uio.h>
diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c
index 34030d79977..86f2b5603bb 100644
--- a/sys/kern/uipc_syscalls.c
+++ b/sys/kern/uipc_syscalls.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uipc_syscalls.c,v 1.160 2017/09/01 15:05:31 mpi Exp $	*/
+/*	$OpenBSD: uipc_syscalls.c,v 1.161 2018/01/02 06:38:45 guenther Exp $	*/
 /*	$NetBSD: uipc_syscalls.c,v 1.19 1996/02/09 19:00:48 christos Exp $	*/
 
 /*
@@ -36,6 +36,7 @@
 #include <sys/systm.h>
 #include <sys/filedesc.h>
 #include <sys/proc.h>
+#include <sys/fcntl.h>
 #include <sys/file.h>
 #include <sys/ioctl.h>
 #include <sys/malloc.h>
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c
index 83bfe6a94e3..675a4d64d50 100644
--- a/sys/kern/vfs_syscalls.c
+++ b/sys/kern/vfs_syscalls.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vfs_syscalls.c,v 1.273 2017/12/11 05:27:40 deraadt Exp $	*/
+/*	$OpenBSD: vfs_syscalls.c,v 1.274 2018/01/02 06:38:45 guenther Exp $	*/
 /*	$NetBSD: vfs_syscalls.c,v 1.71 1996/04/23 10:29:02 mycroft Exp $	*/
 
 /*
@@ -44,6 +44,7 @@
 #include <sys/kernel.h>
 #include <sys/conf.h>
 #include <sys/sysctl.h>
+#include <sys/fcntl.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/lock.h>
diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c
index d6a8159b33f..1c265465129 100644
--- a/sys/kern/vfs_vnops.c
+++ b/sys/kern/vfs_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vfs_vnops.c,v 1.88 2017/08/13 22:08:44 beck Exp $	*/
+/*	$OpenBSD: vfs_vnops.c,v 1.89 2018/01/02 06:38:45 guenther Exp $	*/
 /*	$NetBSD: vfs_vnops.c,v 1.20 1996/02/04 02:18:41 christos Exp $	*/
 
 /*
@@ -41,6 +41,7 @@
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
+#include <sys/fcntl.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/proc.h>
diff --git a/sys/miscfs/fifofs/fifo_vnops.c b/sys/miscfs/fifofs/fifo_vnops.c
index 06c544b4b53..e6381943927 100644
--- a/sys/miscfs/fifofs/fifo_vnops.c
+++ b/sys/miscfs/fifofs/fifo_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fifo_vnops.c,v 1.61 2017/12/18 10:07:55 mpi Exp $	*/
+/*	$OpenBSD: fifo_vnops.c,v 1.62 2018/01/02 06:38:45 guenther Exp $	*/
 /*	$NetBSD: fifo_vnops.c,v 1.18 1996/03/16 23:52:42 christos Exp $	*/
 
 /*
@@ -43,6 +43,7 @@
 #include <sys/socketvar.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
+#include <sys/fcntl.h>
 #include <sys/file.h>
 #include <sys/event.h>
 #include <sys/errno.h>
diff --git a/sys/msdosfs/msdosfs_vnops.c b/sys/msdosfs/msdosfs_vnops.c
index 8452e9be80c..3735e6edbf8 100644
--- a/sys/msdosfs/msdosfs_vnops.c
+++ b/sys/msdosfs/msdosfs_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: msdosfs_vnops.c,v 1.116 2017/08/14 22:43:56 sf Exp $	*/
+/*	$OpenBSD: msdosfs_vnops.c,v 1.117 2018/01/02 06:38:45 guenther Exp $	*/
 /*	$NetBSD: msdosfs_vnops.c,v 1.63 1997/10/17 11:24:19 ws Exp $	*/
 
 /*-
@@ -53,7 +53,8 @@
 #include <sys/systm.h>
 #include <sys/namei.h>
 #include <sys/resourcevar.h>	/* defines plimit structure in proc struct */
-#include <sys/file.h>		/* define FWRITE ... */
+#include <sys/fcntl.h>		/* define FWRITE ... */
+#include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/buf.h>
 #include <sys/proc.h>
diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c
index 574be52e766..00f2551ae50 100644
--- a/sys/ufs/ufs/ufs_vnops.c
+++ b/sys/ufs/ufs/ufs_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ufs_vnops.c,v 1.134 2017/04/19 17:26:13 dhill Exp $	*/
+/*	$OpenBSD: ufs_vnops.c,v 1.135 2018/01/02 06:38:45 guenther Exp $	*/
 /*	$NetBSD: ufs_vnops.c,v 1.18 1996/05/11 18:28:04 mycroft Exp $	*/
 
 /*
@@ -42,6 +42,7 @@
 #include <sys/namei.h>
 #include <sys/resourcevar.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/uvm/uvm_mmap.c b/sys/uvm/uvm_mmap.c
index fce6632942d..634d1228aa9 100644
--- a/sys/uvm/uvm_mmap.c
+++ b/sys/uvm/uvm_mmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_mmap.c,v 1.143 2017/11/30 00:36:10 guenther Exp $	*/
+/*	$OpenBSD: uvm_mmap.c,v 1.144 2018/01/02 06:38:45 guenther Exp $	*/
 /*	$NetBSD: uvm_mmap.c,v 1.49 2001/02/18 21:19:08 chs Exp $	*/
 
 /*
@@ -52,6 +52,7 @@
  */
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/fcntl.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #include <sys/resourcevar.h>
diff --git a/usr.sbin/pstat/pstat.c b/usr.sbin/pstat/pstat.c
index 88432ad02df..14d61fb90ab 100644
--- a/usr.sbin/pstat/pstat.c
+++ b/usr.sbin/pstat/pstat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pstat.c,v 1.113 2017/02/09 22:21:53 jca Exp $	*/
+/*	$OpenBSD: pstat.c,v 1.114 2018/01/02 06:38:45 guenther Exp $	*/
 /*	$NetBSD: pstat.c,v 1.27 1996/10/23 22:50:06 cgd Exp $	*/
 
 /*-
@@ -57,6 +57,7 @@
 #include <stdint.h>
 #include <endian.h>
 #include <err.h>
+#include <fcntl.h>
 #include <kvm.h>
 #include <limits.h>
 #include <nlist.h>
-- 
2.20.1