Reduce uvm include madness. Use <uvm/uvm_extern.h> instead of

<uvm/uvm.h> if possible and remove double inclusions.

ok beck@, mlarkin@, deraadt@

9 files changed, 19 insertions, 19 deletions

diff --git a/sys/kern/dma_alloc.c b/sys/kern/dma_alloc.c
index 504f75c7e26..599dc862f0c 100644
--- a/sys/kern/dma_alloc.c
+++ b/sys/kern/dma_alloc.c
@@ -1,4 +1,5 @@
-/*	$OpenBSD: dma_alloc.c,v 1.9 2011/06/23 21:42:05 ariane Exp $	 */
+/*	$OpenBSD: dma_alloc.c,v 1.10 2014/03/28 17:57:11 mpi Exp $	 */
+
 /*
  * Copyright (c) 2010 Theo de Raadt <deraadt@openbsd.org>
  *
@@ -17,7 +18,8 @@
 
 #include <sys/param.h>
 #include <sys/pool.h>
-#include <uvm/uvm.h>
+
+#include <uvm/uvm_extern.h>
 
 static __inline int	 dma_alloc_index(size_t size);
 
diff --git a/sys/kern/exec_subr.c b/sys/kern/exec_subr.c
index 35222abb803..489dbddcff7 100644
--- a/sys/kern/exec_subr.c
+++ b/sys/kern/exec_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exec_subr.c,v 1.31 2013/10/15 05:30:53 deraadt Exp $	*/
+/*	$OpenBSD: exec_subr.c,v 1.32 2014/03/28 17:57:11 mpi Exp $	*/
 /*	$NetBSD: exec_subr.c,v 1.9 1994/12/04 03:10:42 mycroft Exp $	*/
 
 /*
@@ -41,7 +41,7 @@
 #include <sys/mman.h>
 #include <sys/resourcevar.h>
 
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
 #include <dev/rndvar.h>
 
 #ifdef DEBUG
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index 724f6c49f81..afb0284a2b8 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: init_main.c,v 1.206 2014/03/26 05:23:42 guenther Exp $	*/
+/*	$OpenBSD: init_main.c,v 1.207 2014/03/28 17:57:11 mpi Exp $	*/
 /*	$NetBSD: init_main.c,v 1.84.4.1 1996/06/02 09:08:06 mrg Exp $	*/
 
 /*
@@ -85,7 +85,7 @@
 #include <ufs/ufs/quota.h>
 
 
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
 
 #include <net/if.h>
 #include <net/raw_cb.h>
diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c
index b9a7fb13d49..bea11e5f45b 100644
--- a/sys/kern/kern_fork.c
+++ b/sys/kern/kern_fork.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_fork.c,v 1.160 2014/03/26 05:23:42 guenther Exp $	*/
+/*	$OpenBSD: kern_fork.c,v 1.161 2014/03/28 17:57:11 mpi Exp $	*/
 /*	$NetBSD: kern_fork.c,v 1.29 1996/02/09 18:59:34 christos Exp $	*/
 
 /*
@@ -62,8 +62,7 @@
 #include "systrace.h"
 #include <dev/systrace.h>
 
-#include <uvm/uvm_extern.h>
-#include <uvm/uvm_map.h>
+#include <uvm/uvm.h>
 
 #ifdef __HAVE_MD_TCB
 # include <machine/tcb.h>
diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c
index 5afe208f3b9..c583d69e9fc 100644
--- a/sys/kern/kern_malloc.c
+++ b/sys/kern/kern_malloc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_malloc.c,v 1.104 2014/01/21 01:48:44 tedu Exp $	*/
+/*	$OpenBSD: kern_malloc.c,v 1.105 2014/03/28 17:57:11 mpi Exp $	*/
 /*	$NetBSD: kern_malloc.c,v 1.15.4.2 1996/06/13 17:10:56 cgd Exp $	*/
 
 /*
@@ -43,7 +43,7 @@
 
 #include <dev/rndvar.h>
 
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
 
 static __inline__ long BUCKETINDX(size_t sz)
 {
diff --git a/sys/kern/kern_malloc_debug.c b/sys/kern/kern_malloc_debug.c
index 046af234b4f..2bce1883c18 100644
--- a/sys/kern/kern_malloc_debug.c
+++ b/sys/kern/kern_malloc_debug.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_malloc_debug.c,v 1.32 2013/08/08 23:25:06 syl Exp $	*/
+/*	$OpenBSD: kern_malloc_debug.c,v 1.33 2014/03/28 17:57:11 mpi Exp $	*/
 
 /*
  * Copyright (c) 1999, 2000 Artur Grabowski <art@openbsd.org>
@@ -57,7 +57,7 @@
 #include <sys/systm.h>
 #include <sys/pool.h>
 
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
 
 /*
  * debug_malloc_type and debug_malloc_size define the type and size of
diff --git a/sys/kern/subr_pool.c b/sys/kern/subr_pool.c
index 0be2df00543..2fd1e897cfe 100644
--- a/sys/kern/subr_pool.c
+++ b/sys/kern/subr_pool.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: subr_pool.c,v 1.124 2013/11/05 03:28:45 dlg Exp $	*/
+/*	$OpenBSD: subr_pool.c,v 1.125 2014/03/28 17:57:11 mpi Exp $	*/
 /*	$NetBSD: subr_pool.c,v 1.61 2001/09/26 07:14:56 chs Exp $	*/
 
 /*-
@@ -41,7 +41,7 @@
 #include <sys/syslog.h>
 #include <sys/sysctl.h>
 
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
 #include <dev/rndvar.h>
 
 /*
diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c
index 3e3a975c8f3..d6fb112110e 100644
--- a/sys/kern/uipc_mbuf.c
+++ b/sys/kern/uipc_mbuf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uipc_mbuf.c,v 1.179 2014/03/27 10:30:58 mpi Exp $	*/
+/*	$OpenBSD: uipc_mbuf.c,v 1.180 2014/03/28 17:57:11 mpi Exp $	*/
 /*	$NetBSD: uipc_mbuf.c,v 1.15.4.1 1996/06/13 17:11:44 cgd Exp $	*/
 
 /*
@@ -88,7 +88,6 @@
 #include <net/if.h>
 
 
-#include <uvm/uvm.h>
 #include <uvm/uvm_extern.h>
 
 #ifdef DDB
diff --git a/sys/kern/vfs_biomem.c b/sys/kern/vfs_biomem.c
index aa5838f0029..86044080305 100644
--- a/sys/kern/vfs_biomem.c
+++ b/sys/kern/vfs_biomem.c
@@ -1,4 +1,5 @@
-/*	$OpenBSD: vfs_biomem.c,v 1.28 2013/07/09 15:37:43 beck Exp $ */
+/*	$OpenBSD: vfs_biomem.c,v 1.29 2014/03/28 17:57:11 mpi Exp $ */
+
 /*
  * Copyright (c) 2007 Artur Grabowski <art@openbsd.org>
  *
@@ -24,7 +25,6 @@
 #include <sys/mount.h>
 
 #include <uvm/uvm_extern.h>
-#include <uvm/uvm.h>
 
 vaddr_t buf_kva_start, buf_kva_end;
 int buf_needva;