Less <uvm/uvm.h>

15 files changed, 28 insertions, 43 deletions

diff --git a/sys/arch/hppa/dev/mem.c b/sys/arch/hppa/dev/mem.c
index a0085765c3b..282b31cd505 100644
--- a/sys/arch/hppa/dev/mem.c
+++ b/sys/arch/hppa/dev/mem.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mem.c,v 1.33 2014/03/29 18:09:29 guenther Exp $	*/
+/*	$OpenBSD: mem.c,v 1.34 2014/04/08 09:34:22 mpi Exp $	*/
 
 /*
  * Copyright (c) 1998-2004 Michael Shalayeff
@@ -83,7 +83,7 @@
 #include <sys/ioctl.h>
 #include <sys/file.h>
 
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
 
 #include <machine/conf.h>
 #include <machine/bus.h>
diff --git a/sys/arch/hppa/dev/sti_sgc.c b/sys/arch/hppa/dev/sti_sgc.c
index c04c51819bb..d7c4a3e9c6f 100644
--- a/sys/arch/hppa/dev/sti_sgc.c
+++ b/sys/arch/hppa/dev/sti_sgc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sti_sgc.c,v 1.38 2009/02/06 22:51:04 miod Exp $	*/
+/*	$OpenBSD: sti_sgc.c,v 1.39 2014/04/08 09:34:22 mpi Exp $	*/
 
 /*
  * Copyright (c) 2000-2003 Michael Shalayeff
@@ -36,8 +36,6 @@
 #include <sys/systm.h>
 #include <sys/device.h>
 
-#include <uvm/uvm.h>
-
 #include <machine/bus.h>
 #include <machine/cpu.h>
 #include <machine/iomod.h>
diff --git a/sys/arch/hppa/hppa/genassym.cf b/sys/arch/hppa/hppa/genassym.cf
index 14bd7ec7cef..7c5641eb1c8 100644
--- a/sys/arch/hppa/hppa/genassym.cf
+++ b/sys/arch/hppa/hppa/genassym.cf
@@ -1,4 +1,4 @@
-#	$OpenBSD: genassym.cf,v 1.45 2013/03/31 17:04:28 deraadt Exp $
+#	$OpenBSD: genassym.cf,v 1.46 2014/04/08 09:34:23 mpi Exp $
 
 #
 # Copyright (c) 1982, 1990, 1993
@@ -40,7 +40,7 @@ include <sys/msgbuf.h>
 include <sys/syscall.h>
 include <sys/user.h>
 
-include <uvm/uvm.h>
+include <uvm/uvm_extern.h>
 
 include <machine/cpu.h>
 include <machine/frame.h>
@@ -150,9 +150,6 @@ member	pcb_ksp
 struct	user
 member	u_pcb
 
-struct	uvm
-member	page_idle_zero
-
 struct	uvmexp
 member	fpswtch
 
diff --git a/sys/arch/hppa/hppa/machdep.c b/sys/arch/hppa/hppa/machdep.c
index d7c819814df..80f521eac4c 100644
--- a/sys/arch/hppa/hppa/machdep.c
+++ b/sys/arch/hppa/hppa/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.218 2014/04/04 20:25:21 miod Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.219 2014/04/08 09:34:23 mpi Exp $	*/
 
 /*
  * Copyright (c) 1999-2003 Michael Shalayeff
@@ -54,8 +54,6 @@
 
 #include <net/if.h>
 #include <uvm/uvm.h>
-#include <uvm/uvm_page.h>
-#include <uvm/uvm_swap.h>
 
 #include <dev/cons.h>
 
diff --git a/sys/arch/hppa/hppa/mainbus.c b/sys/arch/hppa/hppa/mainbus.c
index 06a68945261..17d2c114a11 100644
--- a/sys/arch/hppa/hppa/mainbus.c
+++ b/sys/arch/hppa/hppa/mainbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mainbus.c,v 1.82 2014/03/29 18:09:29 guenther Exp $	*/
+/*	$OpenBSD: mainbus.c,v 1.83 2014/04/08 09:34:23 mpi Exp $	*/
 
 /*
  * Copyright (c) 1998-2004 Michael Shalayeff
@@ -39,8 +39,7 @@
 #include <sys/extent.h>
 #include <sys/mbuf.h>
 
-#include <uvm/uvm.h>
-#include <uvm/uvm_page.h>
+#include <uvm/uvm_extern.h>
 
 #include <machine/bus.h>
 #include <machine/pdc.h>
diff --git a/sys/arch/hppa/hppa/pmap.c b/sys/arch/hppa/hppa/pmap.c
index 729a73f8a29..6d6637147cb 100644
--- a/sys/arch/hppa/hppa/pmap.c
+++ b/sys/arch/hppa/hppa/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.160 2012/06/03 13:28:40 jsing Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.161 2014/04/08 09:34:23 mpi Exp $	*/
 
 /*
  * Copyright (c) 1998-2004 Michael Shalayeff
@@ -40,7 +40,7 @@
 #include <sys/pool.h>
 #include <sys/extent.h>
 
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
 
 #include <machine/cpufunc.h>
 #include <machine/iomod.h>
diff --git a/sys/arch/hppa/hppa/trap.c b/sys/arch/hppa/hppa/trap.c
index ae6384a8e44..25968575070 100644
--- a/sys/arch/hppa/hppa/trap.c
+++ b/sys/arch/hppa/hppa/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.128 2014/03/26 05:23:42 guenther Exp $	*/
+/*	$OpenBSD: trap.c,v 1.129 2014/04/08 09:34:23 mpi Exp $	*/
 
 /*
  * Copyright (c) 1998-2004 Michael Shalayeff
@@ -36,7 +36,7 @@
 #include <sys/signalvar.h>
 #include <sys/user.h>
 
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
 
 #include <machine/autoconf.h>
 
diff --git a/sys/arch/hppa/hppa/vm_machdep.c b/sys/arch/hppa/hppa/vm_machdep.c
index 43ebecedc8b..2b49999e610 100644
--- a/sys/arch/hppa/hppa/vm_machdep.c
+++ b/sys/arch/hppa/hppa/vm_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vm_machdep.c,v 1.77 2013/01/16 19:04:43 miod Exp $	*/
+/*	$OpenBSD: vm_machdep.c,v 1.78 2014/04/08 09:34:23 mpi Exp $	*/
 
 /*
  * Copyright (c) 1999-2004 Michael Shalayeff
@@ -45,7 +45,7 @@
 #include <machine/pmap.h>
 #include <machine/pcb.h>
 
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
 
 extern struct pool hppa_fppl;
 
diff --git a/sys/arch/hppa64/dev/mem.c b/sys/arch/hppa64/dev/mem.c
index 51a20555171..930fb6b3af6 100644
--- a/sys/arch/hppa64/dev/mem.c
+++ b/sys/arch/hppa64/dev/mem.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mem.c,v 1.6 2010/12/26 15:40:59 miod Exp $	*/
+/*	$OpenBSD: mem.c,v 1.7 2014/04/08 09:34:23 mpi Exp $	*/
 
 /*
  * Copyright (c) 2005 Michael Shalayeff
@@ -74,7 +74,7 @@
 #include <sys/ioctl.h>
 #include <sys/file.h>
 
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
 
 #include <machine/conf.h>
 #include <machine/bus.h>
diff --git a/sys/arch/hppa64/hppa64/genassym.cf b/sys/arch/hppa64/hppa64/genassym.cf
index 851dcff2407..0e3647383fe 100644
--- a/sys/arch/hppa64/hppa64/genassym.cf
+++ b/sys/arch/hppa64/hppa64/genassym.cf
@@ -1,4 +1,4 @@
-#	$OpenBSD: genassym.cf,v 1.10 2011/04/16 22:02:32 kettenis Exp $
+#	$OpenBSD: genassym.cf,v 1.11 2014/04/08 09:34:23 mpi Exp $
 
 #
 # Copyright (c) 1982, 1990, 1993
@@ -44,7 +44,7 @@ include <machine/vmparam.h>
 include <machine/frame.h>
 include <machine/pcb.h>
 
-include <uvm/uvm.h>
+include <uvm/uvm_extern.h>
 
 # `break' entry points
 export	HPPA_BREAK_KERNEL
@@ -137,9 +137,6 @@ struct	hppa_fpstate
 member	hfp_regs
 member	hfp_cpu
 
-struct	uvm
-member	page_idle_zero
-
 struct	uvmexp
 member	fpswtch
 
diff --git a/sys/arch/hppa64/hppa64/machdep.c b/sys/arch/hppa64/hppa64/machdep.c
index 2e2f19f0c00..174df297e43 100644
--- a/sys/arch/hppa64/hppa64/machdep.c
+++ b/sys/arch/hppa64/hppa64/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.57 2014/03/29 18:09:29 guenther Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.58 2014/04/08 09:34:23 mpi Exp $	*/
 
 /*
  * Copyright (c) 2005 Michael Shalayeff
@@ -46,8 +46,6 @@
 
 #include <net/if.h>
 #include <uvm/uvm.h>
-#include <uvm/uvm_page.h>
-#include <uvm/uvm_swap.h>
 
 #include <dev/cons.h>
 #include <dev/clock_subr.h>
diff --git a/sys/arch/hppa64/hppa64/mainbus.c b/sys/arch/hppa64/hppa64/mainbus.c
index fc353d03732..c2261ad8a4a 100644
--- a/sys/arch/hppa64/hppa64/mainbus.c
+++ b/sys/arch/hppa64/hppa64/mainbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mainbus.c,v 1.13 2011/09/18 10:33:23 kettenis Exp $	*/
+/*	$OpenBSD: mainbus.c,v 1.14 2014/04/08 09:34:23 mpi Exp $	*/
 
 /*
  * Copyright (c) 2005 Michael Shalayeff
@@ -29,8 +29,7 @@
 #include <sys/mbuf.h>
 #include <sys/proc.h>
 
-#include <uvm/uvm.h>
-#include <uvm/uvm_page.h>
+#include <uvm/uvm_extern.h>
 
 #include <machine/pdc.h>
 #include <machine/iomod.h>
diff --git a/sys/arch/hppa64/hppa64/trap.c b/sys/arch/hppa64/hppa64/trap.c
index acd1c5948da..02472f0d158 100644
--- a/sys/arch/hppa64/hppa64/trap.c
+++ b/sys/arch/hppa64/hppa64/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.34 2014/03/26 05:23:42 guenther Exp $	*/
+/*	$OpenBSD: trap.c,v 1.35 2014/04/08 09:34:23 mpi Exp $	*/
 
 /*
  * Copyright (c) 2005 Michael Shalayeff
@@ -27,7 +27,7 @@
 #include <sys/signalvar.h>
 #include <sys/user.h>
 
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
 
 #include <machine/autoconf.h>
 #include <machine/cpufunc.h>
diff --git a/sys/arch/hppa64/hppa64/vm_machdep.c b/sys/arch/hppa64/hppa64/vm_machdep.c
index 3d16da78663..94bea14200d 100644
--- a/sys/arch/hppa64/hppa64/vm_machdep.c
+++ b/sys/arch/hppa64/hppa64/vm_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vm_machdep.c,v 1.19 2013/01/16 19:04:43 miod Exp $	*/
+/*	$OpenBSD: vm_machdep.c,v 1.20 2014/04/08 09:34:23 mpi Exp $	*/
 
 /*
  * Copyright (c) 2005 Michael Shalayeff
@@ -31,12 +31,12 @@
 #include <sys/core.h>
 #include <sys/pool.h>
 
+#include <uvm/uvm_extern.h>
+
 #include <machine/psl.h>
 #include <machine/pmap.h>
 #include <machine/pcb.h>
 
-#include <uvm/uvm.h>
-
 extern struct pool hppa_fppl;
 
 /*
diff --git a/sys/arch/hppa64/include/pmap.h b/sys/arch/hppa64/include/pmap.h
index 4b08d9c613d..d26a9b95b46 100644
--- a/sys/arch/hppa64/include/pmap.h
+++ b/sys/arch/hppa64/include/pmap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.h,v 1.10 2014/01/30 18:16:41 miod Exp $	*/
+/*	$OpenBSD: pmap.h,v 1.11 2014/04/08 09:34:23 mpi Exp $	*/
 
 /*
  * Copyright (c) 2005 Michael Shalayeff
@@ -20,11 +20,10 @@
 #ifndef _MACHINE_PMAP_H_
 #define _MACHINE_PMAP_H_
 
-#include <machine/pte.h>
-#include <uvm/uvm_page.h>
 #include <uvm/uvm_object.h>
 
 #ifdef _KERNEL
+#include <machine/pte.h>
 
 struct pmap {
 	struct uvm_object pm_obj;	/* object (lck by object lock) */