From 669a8cbb0d416f1419de802d729d350440886543 Mon Sep 17 00:00:00 2001
From: miod <miod@openbsd.org>
Date: Mon, 29 Dec 2014 05:29:27 +0000
Subject: [PATCH] Explicitely include <uvm/uvm_extern.h> in order to build on
 variable page size architectures.

---
 sys/kern/kern_ktrace.c        | 4 +++-
 sys/kern/spec_vnops.c         | 4 +++-
 sys/nfs/nfs_subs.c            | 3 ++-
 sys/nfs/nfs_vnops.c           | 4 +++-
 sys/ufs/ext2fs/ext2fs_vnops.c | 4 +++-
 sys/ufs/ffs/ffs_vfsops.c      | 4 +++-
 sys/ufs/ufs/ufs_vnops.c       | 4 +++-
 7 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/sys/kern/kern_ktrace.c b/sys/kern/kern_ktrace.c
index d1ee31273e7..e65418edd8e 100644
--- a/sys/kern/kern_ktrace.c
+++ b/sys/kern/kern_ktrace.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_ktrace.c,v 1.72 2014/12/16 18:30:04 tedu Exp $	*/
+/*	$OpenBSD: kern_ktrace.c,v 1.73 2014/12/29 05:29:27 miod Exp $	*/
 /*	$NetBSD: kern_ktrace.c,v 1.23 1996/02/09 18:59:36 christos Exp $	*/
 
 /*
@@ -49,6 +49,8 @@
 #include <sys/syscall.h>
 #include <sys/syscallargs.h>
 
+#include <uvm/uvm_extern.h>
+
 void	ktrinitheaderraw(struct ktr_header *, uint, pid_t, pid_t);
 void	ktrinitheader(struct ktr_header *, struct proc *, int);
 void	ktrstart(struct proc *, struct vnode *, struct ucred *);
diff --git a/sys/kern/spec_vnops.c b/sys/kern/spec_vnops.c
index 2b7702adbdc..0b9106dd7fc 100644
--- a/sys/kern/spec_vnops.c
+++ b/sys/kern/spec_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: spec_vnops.c,v 1.81 2014/12/16 18:30:04 tedu Exp $	*/
+/*	$OpenBSD: spec_vnops.c,v 1.82 2014/12/29 05:29:27 miod Exp $	*/
 /*	$NetBSD: spec_vnops.c,v 1.29 1996/04/22 01:42:38 christos Exp $	*/
 
 /*
@@ -54,6 +54,8 @@
 #include <sys/specdev.h>
 #include <sys/unistd.h>
 
+#include <uvm/uvm_extern.h>
+
 #define v_lastr v_specinfo->si_lastr
 
 int	spec_open_clone(struct vop_open_args *);
diff --git a/sys/nfs/nfs_subs.c b/sys/nfs/nfs_subs.c
index 0354a64e635..183bfc83bbf 100644
--- a/sys/nfs/nfs_subs.c
+++ b/sys/nfs/nfs_subs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nfs_subs.c,v 1.122 2014/12/23 01:55:03 tedu Exp $	*/
+/*	$OpenBSD: nfs_subs.c,v 1.123 2014/12/29 05:29:28 miod Exp $	*/
 /*	$NetBSD: nfs_subs.c,v 1.27.4.3 1996/07/08 20:34:24 jtc Exp $	*/
 
 /*
@@ -64,6 +64,7 @@
 #include <nfs/nfsmount.h>
 #include <nfs/nfs_var.h>
 
+#include <uvm/uvm_extern.h>
 
 #include <netinet/in.h>
 
diff --git a/sys/nfs/nfs_vnops.c b/sys/nfs/nfs_vnops.c
index 56ab3427fcb..9d66be0c56d 100644
--- a/sys/nfs/nfs_vnops.c
+++ b/sys/nfs/nfs_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nfs_vnops.c,v 1.159 2014/12/18 20:59:21 tedu Exp $	*/
+/*	$OpenBSD: nfs_vnops.c,v 1.160 2014/12/29 05:29:28 miod Exp $	*/
 /*	$NetBSD: nfs_vnops.c,v 1.62.4.1 1996/07/08 20:26:52 jtc Exp $	*/
 
 /*
@@ -73,6 +73,8 @@
 #include <nfs/nfsm_subs.h>
 #include <nfs/nfs_var.h>
 
+#include <uvm/uvm_extern.h>
+
 #include <net/if.h>
 #include <netinet/in.h>
 
diff --git a/sys/ufs/ext2fs/ext2fs_vnops.c b/sys/ufs/ext2fs/ext2fs_vnops.c
index b287b641b39..ec466402869 100644
--- a/sys/ufs/ext2fs/ext2fs_vnops.c
+++ b/sys/ufs/ext2fs/ext2fs_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ext2fs_vnops.c,v 1.68 2014/11/03 21:28:35 tedu Exp $	*/
+/*	$OpenBSD: ext2fs_vnops.c,v 1.69 2014/12/29 05:29:28 miod Exp $	*/
 /*	$NetBSD: ext2fs_vnops.c,v 1.1 1997/06/11 09:34:09 bouyer Exp $	*/
 
 /*
@@ -69,6 +69,8 @@
 #include <ufs/ext2fs/ext2fs_extern.h>
 #include <ufs/ext2fs/ext2fs_dir.h>
 
+#include <uvm/uvm_extern.h>
+
 static int ext2fs_chmod(struct vnode *, mode_t, struct ucred *, struct proc *);
 static int ext2fs_chown(struct vnode *, uid_t, gid_t, struct ucred *, struct proc *);
 
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c
index 7674ea2cbb6..fe556ae5ff2 100644
--- a/sys/ufs/ffs/ffs_vfsops.c
+++ b/sys/ufs/ffs/ffs_vfsops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ffs_vfsops.c,v 1.147 2014/12/23 01:53:34 tedu Exp $	*/
+/*	$OpenBSD: ffs_vfsops.c,v 1.148 2014/12/29 05:29:28 miod Exp $	*/
 /*	$NetBSD: ffs_vfsops.c,v 1.19 1996/02/09 22:22:26 christos Exp $	*/
 
 /*
@@ -63,6 +63,8 @@
 #include <ufs/ffs/fs.h>
 #include <ufs/ffs/ffs_extern.h>
 
+#include <uvm/uvm_extern.h>
+
 int ffs_sbupdate(struct ufsmount *, int);
 int ffs_reload_vnode(struct vnode *, void *);
 int ffs_sync_vnode(struct vnode *, void *);
diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c
index 29bf10c4f6d..ae0e0ebb68c 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.116 2014/11/03 21:28:35 tedu Exp $	*/
+/*	$OpenBSD: ufs_vnops.c,v 1.117 2014/12/29 05:29:28 miod Exp $	*/
 /*	$NetBSD: ufs_vnops.c,v 1.18 1996/05/11 18:28:04 mycroft Exp $	*/
 
 /*
@@ -70,6 +70,8 @@
 #endif
 #include <ufs/ext2fs/ext2fs_extern.h>
 
+#include <uvm/uvm_extern.h>
+
 int ufs_chmod(struct vnode *, int, struct ucred *, struct proc *);
 int ufs_chown(struct vnode *, uid_t, gid_t, struct ucred *, struct proc *);
 int filt_ufsread(struct knote *, long);
-- 
2.20.1