Move declaration of struct vm_page_md from <machine/vmparam.h> to

<machine/pmap.h> where it belongs, and compensate in <uvm/uvm_extern.h>
by including <uvm/uvm_pmap.h> before <uvm/uvm_page.h>. Tested on all
MACHINE_ARCH but amd64 and i386 (and hppa64).

2 files changed, 16 insertions, 16 deletions

diff --git a/sys/arch/alpha/include/pmap.h b/sys/arch/alpha/include/pmap.h
index 4cef887f13e..7e3d9d21596 100644
--- a/sys/arch/alpha/include/pmap.h
+++ b/sys/arch/alpha/include/pmap.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pmap.h,v 1.31 2014/01/26 17:40:11 miod Exp $ */
+/* $OpenBSD: pmap.h,v 1.32 2014/01/30 18:16:41 miod Exp $ */
 /* $NetBSD: pmap.h,v 1.37 2000/11/19 03:16:35 thorpej Exp $ */
 
 /*-
@@ -311,4 +311,18 @@ do {									\
 
 #endif /* _KERNEL */
 
+/*
+ * pmap-specific data stored in the vm_page structure.
+ */
+struct vm_page_md {
+	struct pv_entry *pvh_list;	/* pv entry list */
+	int pvh_attrs;			/* page attributes */
+};
+
+#define	VM_MDPAGE_INIT(pg)						\
+do {									\
+	(pg)->mdpage.pvh_list = NULL;					\
+	(pg)->mdpage.pvh_attrs = 0;					\
+} while (0)
+
 #endif /* _PMAP_MACHINE_ */
diff --git a/sys/arch/alpha/include/vmparam.h b/sys/arch/alpha/include/vmparam.h
index ecb214aee77..3cee4af8579 100644
--- a/sys/arch/alpha/include/vmparam.h
+++ b/sys/arch/alpha/include/vmparam.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: vmparam.h,v 1.24 2014/01/23 22:06:29 miod Exp $ */
+/* $OpenBSD: vmparam.h,v 1.25 2014/01/30 18:16:41 miod Exp $ */
 /* $NetBSD: vmparam.h,v 1.18 2000/05/22 17:13:54 thorpej Exp $ */
 
 /*
@@ -125,18 +125,4 @@
 #define	VM_PHYSSEG_STRAT	VM_PSTRAT_BSEARCH
 #define	VM_PHYSSEG_NOADD			/* no more after vm_mem_init */
 
-/*
- * pmap-specific data stored in the vm_page structure.
- */
-struct vm_page_md {
-	struct pv_entry *pvh_list;	/* pv entry list */
-	int pvh_attrs;			/* page attributes */
-};
-
-#define	VM_MDPAGE_INIT(pg)						\
-do {									\
-	(pg)->mdpage.pvh_list = NULL;					\
-	(pg)->mdpage.pvh_attrs = 0;					\
-} while (0)
-
 #endif	/* ! _MACHINE_VMPARAM_H_ */