Unspammed nested include of <vm/vm_zone.h>.

26 files changed, 56 insertions, 29 deletions

diff --git a/sys/fs/cd9660/cd9660_vnops.c b/sys/fs/cd9660/cd9660_vnops.c
index 8b9981a..9a8d0ff 100644
--- a/sys/fs/cd9660/cd9660_vnops.c
+++ b/sys/fs/cd9660/cd9660_vnops.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_vnops.c	8.19 (Berkeley) 5/27/95
- * $Id: cd9660_vnops.c,v 1.49 1997/10/27 14:55:49 bde Exp $
+ * $Id: cd9660_vnops.c,v 1.50 1997/11/18 14:40:36 phk Exp $
  */
 
 #include <sys/param.h>
@@ -53,6 +53,8 @@
 #include <sys/dirent.h>
 #include <sys/unistd.h>
 
+#include <vm/vm_zone.h>
+
 #include <isofs/cd9660/iso.h>
 #include <isofs/cd9660/cd9660_node.h>
 #include <isofs/cd9660/iso_rrip.h>
diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c
index e32d396..78aa730 100644
--- a/sys/fs/msdosfs/msdosfs_vnops.c
+++ b/sys/fs/msdosfs/msdosfs_vnops.c
@@ -1,4 +1,4 @@
-/*	$Id: msdosfs_vnops.c,v 1.51 1997/10/26 20:55:28 phk Exp $ */
+/*	$Id: msdosfs_vnops.c,v 1.52 1997/10/27 13:33:43 bde Exp $ */
 /*	$NetBSD: msdosfs_vnops.c,v 1.20 1994/08/21 18:44:13 ws Exp $	*/
 
 /*-
@@ -66,6 +66,7 @@
 
 #include <vm/vm.h>
 #include <vm/vm_extern.h>
+#include <vm/vm_zone.h>
 
 #include <msdosfs/bpb.h>
 #include <msdosfs/direntry.h>
diff --git a/sys/fs/procfs/procfs_vnops.c b/sys/fs/procfs/procfs_vnops.c
index 7f6c8b6..b7e522b 100644
--- a/sys/fs/procfs/procfs_vnops.c
+++ b/sys/fs/procfs/procfs_vnops.c
@@ -36,7 +36,7 @@
  *
  *	@(#)procfs_vnops.c	8.18 (Berkeley) 5/21/95
  *
- *	$Id: procfs_vnops.c,v 1.48 1997/12/13 03:13:46 sef Exp $
+ *	$Id: procfs_vnops.c,v 1.49 1997/12/20 03:05:47 sef Exp $
  */
 
 /*
@@ -53,9 +53,9 @@
 #include <sys/signalvar.h>
 #include <sys/vnode.h>
 #include <sys/namei.h>
-#include <sys/malloc.h>
 #include <sys/dirent.h>
 #include <machine/reg.h>
+#include <vm/vm_zone.h>
 #include <miscfs/procfs/procfs.h>
 #include <sys/pioctl.h>
 
diff --git a/sys/fs/unionfs/union_subr.c b/sys/fs/unionfs/union_subr.c
index 8985d87..3b17f9c 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: union_subr.c,v 1.21 1997/09/21 04:23:32 dyson Exp $
+ * $Id: union_subr.c,v 1.22 1997/11/18 15:07:35 phk Exp $
  */
 
 #include <sys/param.h>
@@ -49,6 +49,7 @@
 #include <sys/stat.h>
 #include <vm/vm.h>
 #include <vm/vm_extern.h>	/* for vnode_pager_setsize */
+#include <vm/vm_zone.h>
 #include <miscfs/union/union.h>
 
 #include <sys/proc.h>
diff --git a/sys/gnu/ext2fs/ext2_vnops.c b/sys/gnu/ext2fs/ext2_vnops.c
index ed680da..38a8460 100644
--- a/sys/gnu/ext2fs/ext2_vnops.c
+++ b/sys/gnu/ext2fs/ext2_vnops.c
@@ -51,7 +51,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/resourcevar.h>
-#include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/stat.h>
 #include <sys/buf.h>
@@ -63,6 +62,7 @@
 
 #include <vm/vm.h>
 #include <vm/vm_extern.h>
+#include <vm/vm_zone.h>
 
 #include <sys/signalvar.h>
 #include <ufs/ufs/dir.h>
diff --git a/sys/gnu/fs/ext2fs/ext2_vnops.c b/sys/gnu/fs/ext2fs/ext2_vnops.c
index ed680da..38a8460 100644
--- a/sys/gnu/fs/ext2fs/ext2_vnops.c
+++ b/sys/gnu/fs/ext2fs/ext2_vnops.c
@@ -51,7 +51,6 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/resourcevar.h>
-#include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/stat.h>
 #include <sys/buf.h>
@@ -63,6 +62,7 @@
 
 #include <vm/vm.h>
 #include <vm/vm_extern.h>
+#include <vm/vm_zone.h>
 
 #include <sys/signalvar.h>
 #include <ufs/ufs/dir.h>
diff --git a/sys/i386/ibcs2/imgact_coff.c b/sys/i386/ibcs2/imgact_coff.c
index 376ac91..b69dec9 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: imgact_coff.c,v 1.26 1997/08/25 22:14:57 bde Exp $
+ *	$Id: imgact_coff.c,v 1.27 1997/09/21 04:22:29 dyson Exp $
  */
 
 #include <sys/param.h>
@@ -46,6 +46,7 @@
 #include <vm/vm_map.h>
 #include <vm/vm_kern.h>
 #include <vm/vm_extern.h>
+#include <vm/vm_zone.h>
 
 #include <i386/ibcs2/coff.h>
 #include <i386/ibcs2/ibcs2_util.h>
diff --git a/sys/isofs/cd9660/cd9660_vnops.c b/sys/isofs/cd9660/cd9660_vnops.c
index 8b9981a..9a8d0ff 100644
--- a/sys/isofs/cd9660/cd9660_vnops.c
+++ b/sys/isofs/cd9660/cd9660_vnops.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_vnops.c	8.19 (Berkeley) 5/27/95
- * $Id: cd9660_vnops.c,v 1.49 1997/10/27 14:55:49 bde Exp $
+ * $Id: cd9660_vnops.c,v 1.50 1997/11/18 14:40:36 phk Exp $
  */
 
 #include <sys/param.h>
@@ -53,6 +53,8 @@
 #include <sys/dirent.h>
 #include <sys/unistd.h>
 
+#include <vm/vm_zone.h>
+
 #include <isofs/cd9660/iso.h>
 #include <isofs/cd9660/cd9660_node.h>
 #include <isofs/cd9660/iso_rrip.h>
diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c
index eca4c3f..5667868 100644
--- a/sys/kern/kern_exec.c
+++ b/sys/kern/kern_exec.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: kern_exec.c,v 1.70 1997/12/16 15:40:29 davidg Exp $
+ *	$Id: kern_exec.c,v 1.71 1997/12/20 03:05:45 sef Exp $
  */
 
 #include <sys/param.h>
@@ -58,6 +58,7 @@
 #include <vm/vm_kern.h>
 #include <vm/vm_extern.h>
 #include <vm/vm_object.h>
+#include <vm/vm_zone.h>
 
 #include <machine/reg.h>
 
diff --git a/sys/kern/vfs_extattr.c b/sys/kern/vfs_extattr.c
index 928d16b..6d71a6c 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.85 1997/12/02 10:32:21 bde Exp $
+ * $Id: vfs_syscalls.c,v 1.86 1997/12/16 17:40:31 eivind Exp $
  */
 
 /* For 4.3 integer FS ID compatibility */
@@ -75,6 +75,7 @@
 #include <vm/vm.h>
 #include <vm/vm_object.h>
 #include <vm/vm_extern.h>
+#include <vm/vm_zone.h>
 #include <sys/sysctl.h>
 
 static int change_dir __P((struct nameidata *ndp, struct proc *p));
diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c
index 607d168..fcfd1da 100644
--- a/sys/kern/vfs_lookup.c
+++ b/sys/kern/vfs_lookup.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_lookup.c	8.4 (Berkeley) 2/16/94
- * $Id: vfs_lookup.c,v 1.19 1997/09/02 20:06:01 bde Exp $
+ * $Id: vfs_lookup.c,v 1.20 1997/09/21 04:23:01 dyson Exp $
  */
 
 #include "opt_ktrace.h"
@@ -46,7 +46,6 @@
 #include <sys/namei.h>
 #include <sys/vnode.h>
 #include <sys/mount.h>
-#include <sys/malloc.h>
 #include <sys/filedesc.h>
 #include <sys/proc.h>
 
@@ -54,6 +53,8 @@
 #include <sys/ktrace.h>
 #endif
 
+#include <vm/vm_zone.h>
+
 /*
  * Convert a pathname into a pointer to a locked inode.
  *
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c
index 928d16b..6d71a6c 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.85 1997/12/02 10:32:21 bde Exp $
+ * $Id: vfs_syscalls.c,v 1.86 1997/12/16 17:40:31 eivind Exp $
  */
 
 /* For 4.3 integer FS ID compatibility */
@@ -75,6 +75,7 @@
 #include <vm/vm.h>
 #include <vm/vm_object.h>
 #include <vm/vm_extern.h>
+#include <vm/vm_zone.h>
 #include <sys/sysctl.h>
 
 static int change_dir __P((struct nameidata *ndp, struct proc *p));
diff --git a/sys/miscfs/procfs/procfs_vnops.c b/sys/miscfs/procfs/procfs_vnops.c
index 7f6c8b6..b7e522b 100644
--- a/sys/miscfs/procfs/procfs_vnops.c
+++ b/sys/miscfs/procfs/procfs_vnops.c
@@ -36,7 +36,7 @@
  *
  *	@(#)procfs_vnops.c	8.18 (Berkeley) 5/21/95
  *
- *	$Id: procfs_vnops.c,v 1.48 1997/12/13 03:13:46 sef Exp $
+ *	$Id: procfs_vnops.c,v 1.49 1997/12/20 03:05:47 sef Exp $
  */
 
 /*
@@ -53,9 +53,9 @@
 #include <sys/signalvar.h>
 #include <sys/vnode.h>
 #include <sys/namei.h>
-#include <sys/malloc.h>
 #include <sys/dirent.h>
 #include <machine/reg.h>
+#include <vm/vm_zone.h>
 #include <miscfs/procfs/procfs.h>
 #include <sys/pioctl.h>
 
diff --git a/sys/miscfs/union/union_subr.c b/sys/miscfs/union/union_subr.c
index 8985d87..3b17f9c 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: union_subr.c,v 1.21 1997/09/21 04:23:32 dyson Exp $
+ * $Id: union_subr.c,v 1.22 1997/11/18 15:07:35 phk Exp $
  */
 
 #include <sys/param.h>
@@ -49,6 +49,7 @@
 #include <sys/stat.h>
 #include <vm/vm.h>
 #include <vm/vm_extern.h>	/* for vnode_pager_setsize */
+#include <vm/vm_zone.h>
 #include <miscfs/union/union.h>
 
 #include <sys/proc.h>
diff --git a/sys/msdosfs/msdosfs_vnops.c b/sys/msdosfs/msdosfs_vnops.c
index e32d396..78aa730 100644
--- a/sys/msdosfs/msdosfs_vnops.c
+++ b/sys/msdosfs/msdosfs_vnops.c
@@ -1,4 +1,4 @@
-/*	$Id: msdosfs_vnops.c,v 1.51 1997/10/26 20:55:28 phk Exp $ */
+/*	$Id: msdosfs_vnops.c,v 1.52 1997/10/27 13:33:43 bde Exp $ */
 /*	$NetBSD: msdosfs_vnops.c,v 1.20 1994/08/21 18:44:13 ws Exp $	*/
 
 /*-
@@ -66,6 +66,7 @@
 
 #include <vm/vm.h>
 #include <vm/vm_extern.h>
+#include <vm/vm_zone.h>
 
 #include <msdosfs/bpb.h>
 #include <msdosfs/direntry.h>
diff --git a/sys/nfs/nfs_common.c b/sys/nfs/nfs_common.c
index 9f33785..159f7e0 100644
--- a/sys/nfs/nfs_common.c
+++ b/sys/nfs/nfs_common.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_subs.c	8.3 (Berkeley) 1/4/94
- * $Id: nfs_subs.c,v 1.47 1997/11/07 08:53:24 phk Exp $
+ * $Id: nfs_subs.c,v 1.48 1997/12/20 00:25:01 bde Exp $
  */
 
 /*
@@ -60,6 +60,7 @@
 #include <vm/vm.h>
 #include <vm/vm_object.h>
 #include <vm/vm_extern.h>
+#include <vm/vm_zone.h>
 
 #include <nfs/rpcv2.h>
 #include <nfs/nfsproto.h>
diff --git a/sys/nfs/nfs_node.c b/sys/nfs/nfs_node.c
index a913465..1c6397b 100644
--- a/sys/nfs/nfs_node.c
+++ b/sys/nfs/nfs_node.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_node.c	8.6 (Berkeley) 5/22/95
- * $Id: nfs_node.c,v 1.21 1997/10/12 20:25:40 phk Exp $
+ * $Id: nfs_node.c,v 1.22 1997/10/28 14:06:20 bde Exp $
  */
 
 
@@ -46,6 +46,8 @@
 #include <sys/vnode.h>
 #include <sys/malloc.h>
 
+#include <vm/vm_zone.h>
+
 #include <nfs/rpcv2.h>
 #include <nfs/nfsproto.h>
 #include <nfs/nfs.h>
diff --git a/sys/nfs/nfs_serv.c b/sys/nfs/nfs_serv.c
index 0cbfa9b..e5cc745 100644
--- a/sys/nfs/nfs_serv.c
+++ b/sys/nfs/nfs_serv.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_serv.c	8.3 (Berkeley) 1/12/94
- * $Id: nfs_serv.c,v 1.51 1997/09/21 04:23:49 dyson Exp $
+ * $Id: nfs_serv.c,v 1.52 1997/10/28 15:59:05 bde Exp $
  */
 
 /*
@@ -75,6 +75,7 @@
 
 #include <vm/vm.h>
 #include <vm/vm_extern.h>
+#include <vm/vm_zone.h>
 
 #include <nfs/nfsproto.h>
 #include <nfs/rpcv2.h>
diff --git a/sys/nfs/nfs_subs.c b/sys/nfs/nfs_subs.c
index 9f33785..159f7e0 100644
--- a/sys/nfs/nfs_subs.c
+++ b/sys/nfs/nfs_subs.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_subs.c	8.3 (Berkeley) 1/4/94
- * $Id: nfs_subs.c,v 1.47 1997/11/07 08:53:24 phk Exp $
+ * $Id: nfs_subs.c,v 1.48 1997/12/20 00:25:01 bde Exp $
  */
 
 /*
@@ -60,6 +60,7 @@
 #include <vm/vm.h>
 #include <vm/vm_object.h>
 #include <vm/vm_extern.h>
+#include <vm/vm_zone.h>
 
 #include <nfs/rpcv2.h>
 #include <nfs/nfsproto.h>
diff --git a/sys/nfs/nfs_vnops.c b/sys/nfs/nfs_vnops.c
index 83531e3..6aa27ca 100644
--- a/sys/nfs/nfs_vnops.c
+++ b/sys/nfs/nfs_vnops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_vnops.c	8.16 (Berkeley) 5/27/95
- * $Id: nfs_vnops.c,v 1.71 1997/10/27 13:33:44 bde Exp $
+ * $Id: nfs_vnops.c,v 1.72 1997/11/07 09:20:48 phk Exp $
  */
 
 
@@ -59,6 +59,7 @@
 
 #include <vm/vm.h>
 #include <vm/vm_extern.h>
+#include <vm/vm_zone.h>
 
 #include <miscfs/fifofs/fifo.h>
 #include <miscfs/specfs/specdev.h>
diff --git a/sys/nfsclient/nfs_node.c b/sys/nfsclient/nfs_node.c
index a913465..1c6397b 100644
--- a/sys/nfsclient/nfs_node.c
+++ b/sys/nfsclient/nfs_node.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_node.c	8.6 (Berkeley) 5/22/95
- * $Id: nfs_node.c,v 1.21 1997/10/12 20:25:40 phk Exp $
+ * $Id: nfs_node.c,v 1.22 1997/10/28 14:06:20 bde Exp $
  */
 
 
@@ -46,6 +46,8 @@
 #include <sys/vnode.h>
 #include <sys/malloc.h>
 
+#include <vm/vm_zone.h>
+
 #include <nfs/rpcv2.h>
 #include <nfs/nfsproto.h>
 #include <nfs/nfs.h>
diff --git a/sys/nfsclient/nfs_subs.c b/sys/nfsclient/nfs_subs.c
index 9f33785..159f7e0 100644
--- a/sys/nfsclient/nfs_subs.c
+++ b/sys/nfsclient/nfs_subs.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_subs.c	8.3 (Berkeley) 1/4/94
- * $Id: nfs_subs.c,v 1.47 1997/11/07 08:53:24 phk Exp $
+ * $Id: nfs_subs.c,v 1.48 1997/12/20 00:25:01 bde Exp $
  */
 
 /*
@@ -60,6 +60,7 @@
 #include <vm/vm.h>
 #include <vm/vm_object.h>
 #include <vm/vm_extern.h>
+#include <vm/vm_zone.h>
 
 #include <nfs/rpcv2.h>
 #include <nfs/nfsproto.h>
diff --git a/sys/nfsclient/nfs_vnops.c b/sys/nfsclient/nfs_vnops.c
index 83531e3..6aa27ca 100644
--- a/sys/nfsclient/nfs_vnops.c
+++ b/sys/nfsclient/nfs_vnops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_vnops.c	8.16 (Berkeley) 5/27/95
- * $Id: nfs_vnops.c,v 1.71 1997/10/27 13:33:44 bde Exp $
+ * $Id: nfs_vnops.c,v 1.72 1997/11/07 09:20:48 phk Exp $
  */
 
 
@@ -59,6 +59,7 @@
 
 #include <vm/vm.h>
 #include <vm/vm_extern.h>
+#include <vm/vm_zone.h>
 
 #include <miscfs/fifofs/fifo.h>
 #include <miscfs/specfs/specdev.h>
diff --git a/sys/nfsserver/nfs_serv.c b/sys/nfsserver/nfs_serv.c
index 0cbfa9b..e5cc745 100644
--- a/sys/nfsserver/nfs_serv.c
+++ b/sys/nfsserver/nfs_serv.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_serv.c	8.3 (Berkeley) 1/12/94
- * $Id: nfs_serv.c,v 1.51 1997/09/21 04:23:49 dyson Exp $
+ * $Id: nfs_serv.c,v 1.52 1997/10/28 15:59:05 bde Exp $
  */
 
 /*
@@ -75,6 +75,7 @@
 
 #include <vm/vm.h>
 #include <vm/vm_extern.h>
+#include <vm/vm_zone.h>
 
 #include <nfs/nfsproto.h>
 #include <nfs/rpcv2.h>
diff --git a/sys/nfsserver/nfs_srvsubs.c b/sys/nfsserver/nfs_srvsubs.c
index 9f33785..159f7e0 100644
--- a/sys/nfsserver/nfs_srvsubs.c
+++ b/sys/nfsserver/nfs_srvsubs.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)nfs_subs.c	8.3 (Berkeley) 1/4/94
- * $Id: nfs_subs.c,v 1.47 1997/11/07 08:53:24 phk Exp $
+ * $Id: nfs_subs.c,v 1.48 1997/12/20 00:25:01 bde Exp $
  */
 
 /*
@@ -60,6 +60,7 @@
 #include <vm/vm.h>
 #include <vm/vm_object.h>
 #include <vm/vm_extern.h>
+#include <vm/vm_zone.h>
 
 #include <nfs/rpcv2.h>
 #include <nfs/nfsproto.h>
diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c
index 71aebef..b4f7828 100644
--- a/sys/ufs/ufs/ufs_vnops.c
+++ b/sys/ufs/ufs/ufs_vnops.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_vnops.c	8.27 (Berkeley) 5/27/95
- * $Id: ufs_vnops.c,v 1.72 1997/12/15 03:09:59 wollman Exp $
+ * $Id: ufs_vnops.c,v 1.73 1997/12/15 21:51:45 eivind Exp $
  */
 
 #include "opt_quota.h"
@@ -58,6 +58,8 @@
 #include <sys/lockf.h>
 #include <sys/poll.h>
 
+#include <vm/vm_zone.h>
+
 #include <miscfs/specfs/specdev.h>
 #include <miscfs/fifofs/fifo.h>