If you include <uvm/uvm.h>, you do not need to include any other <uvm/uvm_foo.h>

10 files changed, 13 insertions, 30 deletions

diff --git a/sys/arch/alpha/alpha/machdep.c b/sys/arch/alpha/alpha/machdep.c
index 8b6091aa61f..57a751ac5e5 100644
--- a/sys/arch/alpha/alpha/machdep.c
+++ b/sys/arch/alpha/alpha/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.125 2010/06/27 05:06:20 beck Exp $ */
+/* $OpenBSD: machdep.c,v 1.126 2010/06/27 13:28:44 miod Exp $ */
 /* $NetBSD: machdep.c,v 1.210 2000/06/01 17:12:38 thorpej Exp $ */
 
 /*-
@@ -78,8 +78,6 @@
 #include <sys/user.h>
 #include <sys/exec.h>
 #include <sys/exec_ecoff.h>
-#include <uvm/uvm_extern.h>
-#include <uvm/uvm_swap.h>
 #include <uvm/uvm.h>
 #include <sys/sysctl.h>
 #include <sys/core.h>
diff --git a/sys/arch/amd64/amd64/machdep.c b/sys/arch/amd64/amd64/machdep.c
index 68bb5bc526b..c8967560102 100644
--- a/sys/arch/amd64/amd64/machdep.c
+++ b/sys/arch/amd64/amd64/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.112 2010/06/27 03:03:48 thib Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.113 2010/06/27 13:28:46 miod Exp $	*/
 /*	$NetBSD: machdep.c,v 1.3 2003/05/07 22:58:18 fvdl Exp $	*/
 
 /*-
@@ -95,9 +95,6 @@
 #include <stand/boot/bootarg.h>
 
 #include <uvm/uvm.h>
-#include <uvm/uvm_extern.h>
-#include <uvm/uvm_page.h>
-#include <uvm/uvm_swap.h>
 
 #include <sys/sysctl.h>
 
diff --git a/sys/arch/arm/arm/arm32_machdep.c b/sys/arch/arm/arm/arm32_machdep.c
index d3e6e5b96e3..6b436f2f6c9 100644
--- a/sys/arch/arm/arm/arm32_machdep.c
+++ b/sys/arch/arm/arm/arm32_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: arm32_machdep.c,v 1.34 2010/06/27 03:03:48 thib Exp $	*/
+/*	$OpenBSD: arm32_machdep.c,v 1.35 2010/06/27 13:28:46 miod Exp $	*/
 /*	$NetBSD: arm32_machdep.c,v 1.42 2003/12/30 12:33:15 pk Exp $	*/
 
 /*
@@ -55,7 +55,6 @@
 #include <sys/msgbuf.h>
 #include <sys/device.h>
 #include <uvm/uvm.h>
-#include <uvm/uvm_extern.h>
 #include <sys/sysctl.h>
 
 #include <dev/cons.h>
diff --git a/sys/arch/i386/i386/kvm86.c b/sys/arch/i386/i386/kvm86.c
index a89e80e3cae..c279e14e6c9 100644
--- a/sys/arch/i386/i386/kvm86.c
+++ b/sys/arch/i386/i386/kvm86.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kvm86.c,v 1.4 2010/04/23 21:34:40 deraadt Exp $ */
+/* $OpenBSD: kvm86.c,v 1.5 2010/06/27 13:28:46 miod Exp $ */
 /* $NetBSD: kvm86.c,v 1.10 2005/12/26 19:23:59 perry Exp $ */
 /*
  * Copyright (c) 2002
@@ -34,7 +34,6 @@
 #include <sys/malloc.h>
 #include <sys/mutex.h>
 #include <sys/lock.h>
-#include <uvm/uvm_extern.h>
 #include <uvm/uvm.h>
 #include <machine/pcb.h>
 #include <machine/pte.h>
diff --git a/sys/arch/macppc/macppc/machdep.c b/sys/arch/macppc/macppc/machdep.c
index 44cd0be02a6..c1f9904562c 100644
--- a/sys/arch/macppc/macppc/machdep.c
+++ b/sys/arch/macppc/macppc/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.118 2010/06/27 03:03:48 thib Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.119 2010/06/27 13:28:46 miod Exp $	*/
 /*	$NetBSD: machdep.c,v 1.4 1996/10/16 19:33:11 ws Exp $	*/
 
 /*
@@ -53,7 +53,6 @@
 #include <sys/kcore.h>
 
 #include <uvm/uvm.h>
-#include <uvm/uvm_extern.h>
 
 #include <dev/cons.h>
 
diff --git a/sys/arch/sgi/sgi/machdep.c b/sys/arch/sgi/sgi/machdep.c
index 14742f0e9c4..fa527d52225 100644
--- a/sys/arch/sgi/sgi/machdep.c
+++ b/sys/arch/sgi/sgi/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.104 2010/06/27 03:03:48 thib Exp $ */
+/*	$OpenBSD: machdep.c,v 1.105 2010/06/27 13:28:46 miod Exp $ */
 
 /*
  * Copyright (c) 2003-2004 Opsycon AB  (www.opsycon.se / www.opsycon.com)
@@ -48,7 +48,6 @@
 #endif
 
 #include <uvm/uvm.h>
-#include <uvm/uvm_extern.h>
 
 #include <machine/db_machdep.h>
 #include <ddb/db_interface.h>
diff --git a/sys/arch/socppc/socppc/machdep.c b/sys/arch/socppc/socppc/machdep.c
index 9e0aec76061..1cae8676d43 100644
--- a/sys/arch/socppc/socppc/machdep.c
+++ b/sys/arch/socppc/socppc/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.25 2010/06/27 03:03:48 thib Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.26 2010/06/27 13:28:46 miod Exp $	*/
 /*	$NetBSD: machdep.c,v 1.4 1996/10/16 19:33:11 ws Exp $	*/
 
 /*
@@ -49,7 +49,6 @@
 #include <sys/user.h>
 
 #include <uvm/uvm.h>
-#include <uvm/uvm_extern.h>
 
 #include <machine/bat.h>
 #include <machine/bus.h>
diff --git a/sys/arch/solbourne/solbourne/machdep.c b/sys/arch/solbourne/solbourne/machdep.c
index 92ed8df10e6..f3bc2efa62b 100644
--- a/sys/arch/solbourne/solbourne/machdep.c
+++ b/sys/arch/solbourne/solbourne/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.14 2009/08/11 19:17:17 miod Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.15 2010/06/27 13:28:47 miod Exp $	*/
 /*	OpenBSD: machdep.c,v 1.105 2005/04/11 15:13:01 deraadt Exp 	*/
 
 /*
@@ -62,7 +62,7 @@
 #include <sys/sysctl.h>
 #include <sys/extent.h>
 
-#include <uvm/uvm_extern.h>
+#include <uvm/uvm.h>
 
 #include <dev/rndvar.h>
 
@@ -81,8 +81,6 @@
 #include <sparc/sparc/cache.h>
 #include <sparc/sparc/cpuvar.h>
 
-#include <uvm/uvm.h>
-
 #include "auxreg.h"
 
 #include <sparc/sparc/intreg.h>
diff --git a/sys/arch/sparc/sparc/machdep.c b/sys/arch/sparc/sparc/machdep.c
index d1543fe59e8..4ed5029fe22 100644
--- a/sys/arch/sparc/sparc/machdep.c
+++ b/sys/arch/sparc/sparc/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.125 2010/06/27 03:03:48 thib Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.126 2010/06/27 13:28:47 miod Exp $	*/
 /*	$NetBSD: machdep.c,v 1.85 1997/09/12 08:55:02 pk Exp $ */
 
 /*
@@ -62,8 +62,7 @@
 #include <sys/sysctl.h>
 #include <sys/extent.h>
 
-#include <uvm/uvm_extern.h>
-#include <uvm/uvm_swap.h>
+#include <uvm/uvm.h>
 
 #include <dev/rndvar.h>
 
@@ -81,8 +80,6 @@
 #include <sparc/sparc/vaddrs.h>
 #include <sparc/sparc/cpuvar.h>
 
-#include <uvm/uvm.h>
-
 #ifdef SUN4M
 #include "power.h"
 #if NPOWER > 0
diff --git a/sys/arch/sparc64/sparc64/db_interface.c b/sys/arch/sparc64/sparc64/db_interface.c
index a5f3d190a79..8c1a64f3513 100644
--- a/sys/arch/sparc64/sparc64/db_interface.c
+++ b/sys/arch/sparc64/sparc64/db_interface.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_interface.c,v 1.27 2008/12/14 17:10:44 kettenis Exp $	*/
+/*	$OpenBSD: db_interface.c,v 1.28 2010/06/27 13:28:47 miod Exp $	*/
 /*	$NetBSD: db_interface.c,v 1.61 2001/07/31 06:55:47 eeh Exp $ */
 
 /*
@@ -36,7 +36,7 @@
 #include <sys/systm.h>
 #include <sys/malloc.h>
 
-#include <uvm/uvm_extern.h>
+#include <uvm/uvm.h>
 
 #include <dev/cons.h>
 
@@ -1071,8 +1071,6 @@ db_register_xir(void (*fun)(void *, int), void *arg)
 }
 
 
-#include <uvm/uvm.h>
-
 #ifdef UVMHIST
 void db_uvmhistdump(db_expr_t, int, db_expr_t, char *);
 extern void uvmhist_dump(struct uvm_history *);