Use <uvm/uvm_extern.h> if it's enough.

7 files changed, 13 insertions, 21 deletions

diff --git a/sys/arch/sparc64/dev/vdsk.c b/sys/arch/sparc64/dev/vdsk.c
index 7af1a97be22..c868f15386f 100644
--- a/sys/arch/sparc64/dev/vdsk.c
+++ b/sys/arch/sparc64/dev/vdsk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vdsk.c,v 1.36 2014/01/22 23:57:59 kettenis Exp $	*/
+/*	$OpenBSD: vdsk.c,v 1.37 2014/04/03 09:15:06 mpi Exp $	*/
 /*
  * Copyright (c) 2009, 2011 Mark Kettenis
  *
@@ -24,7 +24,7 @@
 #include <machine/autoconf.h>
 #include <machine/hypervisor.h>
 
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
 
 #include <scsi/scsi_all.h>
 #include <scsi/cd.h>
diff --git a/sys/arch/sparc64/dev/vdsp.c b/sys/arch/sparc64/dev/vdsp.c
index db488ff916e..0e26bc6d6cd 100644
--- a/sys/arch/sparc64/dev/vdsp.c
+++ b/sys/arch/sparc64/dev/vdsp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vdsp.c,v 1.24 2014/01/24 09:58:03 kettenis Exp $	*/
+/*	$OpenBSD: vdsp.c,v 1.25 2014/04/03 09:15:06 mpi Exp $	*/
 /*
  * Copyright (c) 2009, 2011, 2014 Mark Kettenis
  *
@@ -33,7 +33,7 @@
 #include <machine/hypervisor.h>
 #include <machine/mdesc.h>
 
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
 
 #include <scsi/scsi_all.h>
 #include <scsi/scsi_disk.h>
diff --git a/sys/arch/sparc64/dev/vldcp.c b/sys/arch/sparc64/dev/vldcp.c
index 28a91a759db..f0ab1c156d0 100644
--- a/sys/arch/sparc64/dev/vldcp.c
+++ b/sys/arch/sparc64/dev/vldcp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vldcp.c,v 1.6 2012/10/27 21:47:52 kettenis Exp $	*/
+/*	$OpenBSD: vldcp.c,v 1.7 2014/04/03 09:15:06 mpi Exp $	*/
 /*
  * Copyright (c) 2009, 2012 Mark Kettenis
  *
@@ -27,7 +27,7 @@
 #include <machine/hypervisor.h>
 #include <machine/mdesc.h>
 
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
 
 #include <sparc64/dev/cbusvar.h>
 #include <sparc64/dev/ldcvar.h>
diff --git a/sys/arch/sparc64/dev/vnet.c b/sys/arch/sparc64/dev/vnet.c
index 007f60b4343..9fd0e2f98f7 100644
--- a/sys/arch/sparc64/dev/vnet.c
+++ b/sys/arch/sparc64/dev/vnet.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vnet.c,v 1.29 2013/08/21 05:21:42 dlg Exp $	*/
+/*	$OpenBSD: vnet.c,v 1.30 2014/04/03 09:15:06 mpi Exp $	*/
 /*
  * Copyright (c) 2009 Mark Kettenis
  *
@@ -42,7 +42,7 @@
 #include <net/bpf.h>
 #endif
 
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
 
 #include <sparc64/dev/cbusvar.h>
 #include <sparc64/dev/ldcvar.h>
diff --git a/sys/arch/sparc64/sparc64/db_interface.c b/sys/arch/sparc64/sparc64/db_interface.c
index d8fba368c84..e12b70343c7 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.33 2014/03/29 18:09:30 guenther Exp $	*/
+/*	$OpenBSD: db_interface.c,v 1.34 2014/04/03 09:15:06 mpi Exp $	*/
 /*	$NetBSD: db_interface.c,v 1.61 2001/07/31 06:55:47 eeh Exp $ */
 
 /*
@@ -36,8 +36,6 @@
 #include <sys/systm.h>
 #include <sys/malloc.h>
 
-#include <uvm/uvm.h>
-
 #include <dev/cons.h>
 
 #include <machine/db_machdep.h>
@@ -1097,9 +1095,6 @@ struct db_command db_machine_command_table[] = {
 	{ "tf",		db_dump_trap,	0,	0 },
 	{ "ts",		db_dump_ts,	0,	0 },
 	{ "traptrace",	db_traptrace,	0,	0 },
-#ifdef UVMHIST
-	{ "uvmdump",	db_uvmhistdump,	0,	0 },
-#endif
 	{ "watch",	db_watch,	0,	0 },
 	{ "window",	db_dump_window,	0,	0 },
 	{ "xir",	db_xir,		0,	0 },
diff --git a/sys/arch/sparc64/sparc64/genassym.cf b/sys/arch/sparc64/sparc64/genassym.cf
index 5b19a21685e..33027f5b38f 100644
--- a/sys/arch/sparc64/sparc64/genassym.cf
+++ b/sys/arch/sparc64/sparc64/genassym.cf
@@ -1,4 +1,4 @@
-#	$OpenBSD: genassym.cf,v 1.34 2010/09/28 20:27:55 miod Exp $
+#	$OpenBSD: genassym.cf,v 1.35 2014/04/03 09:15:06 mpi Exp $
 #	$NetBSD: genassym.cf,v 1.23 2001/08/08 00:09:30 eeh Exp $
 
 #
@@ -79,7 +79,7 @@ include <sys/device.h>
 include <sys/disklabel.h>
 include <sys/disk.h>
 
-include <uvm/uvm.h>
+include <uvm/uvm_extern.h>
 
 ifdef DDB
 include <machine/db_machdep.h>
@@ -120,9 +120,6 @@ define	USIZ		sizeof(struct user)
 # VM structure fields
 define	VM_PMAP		offsetof(struct vmspace, vm_map.pmap)
 
-# UVM structure fields
-define	UVM_PAGE_IDLE_ZERO	offsetof(struct uvm, page_idle_zero)
-
 # pmap structure fields
 struct	pmap
 member	pm_ctx
diff --git a/sys/arch/sparc64/sparc64/mdesc.c b/sys/arch/sparc64/sparc64/mdesc.c
index 9994392cfb8..999867c40db 100644
--- a/sys/arch/sparc64/sparc64/mdesc.c
+++ b/sys/arch/sparc64/sparc64/mdesc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mdesc.c,v 1.3 2009/05/10 12:37:01 kettenis Exp $	*/
+/*	$OpenBSD: mdesc.c,v 1.4 2014/04/03 09:15:06 mpi Exp $	*/
 /*
  * Copyright (c) 2009 Mark Kettenis
  *
@@ -20,7 +20,7 @@
 #include <sys/malloc.h>
 #include <sys/systm.h>
 
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
 
 #include <machine/autoconf.h>
 #include <machine/hypervisor.h>