Update #include list after not-so-recent uvm includes cleanups.

diff --git a/sys/arch/hppa64/include/pmap.h b/sys/arch/hppa64/include/pmap.h
index d26a9b9..e00d1cd 100644 (file)
--- a/sys/arch/hppa64/include/pmap.h
+++ b/sys/arch/hppa64/include/pmap.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: pmap.h,v 1.11 2014/04/08 09:34:23 mpi Exp $   */
+/*     $OpenBSD: pmap.h,v 1.12 2014/05/08 21:31:56 miod Exp $  */
 
 /*
  * Copyright (c) 2005 Michael Shalayeff
@@ -22,7 +22,26 @@
 
 #include <uvm/uvm_object.h>
 
+#if !defined(_LOCORE)
+
+#include <sys/lock.h>
+
+struct pv_entry;
+struct vm_page_md {
+       struct simplelock pvh_lock;     /* locks every pv on this list */
+       struct pv_entry *pvh_list;      /* head of list (locked by pvh_lock) */
+       u_int           pvh_attrs;      /* to preserve ref/mod */
+};
+
+#define        VM_MDPAGE_INIT(pg) do {                         \
+       simple_lock_init(&(pg)->mdpage.pvh_lock);       \
+       (pg)->mdpage.pvh_list = NULL;                   \
+       (pg)->mdpage.pvh_attrs = 0;                     \
+} while (0)
+#endif
+
 #ifdef _KERNEL
+#include <uvm/uvm_page.h>
 #include <machine/pte.h>
 
 struct pmap {
@@ -120,22 +139,4 @@ pmap_protect(struct pmap *pmap, vaddr_t sva, vaddr_t eva, vm_prot_t prot)
 
 #endif /* _KERNEL */
 
-#if !defined(_LOCORE)
-
-#include <sys/lock.h>
-
-struct pv_entry;
-struct vm_page_md {
-       struct simplelock pvh_lock;     /* locks every pv on this list */
-       struct pv_entry *pvh_list;      /* head of list (locked by pvh_lock) */
-       u_int           pvh_attrs;      /* to preserve ref/mod */
-};
-
-#define        VM_MDPAGE_INIT(pg) do {                         \
-       simple_lock_init(&(pg)->mdpage.pvh_lock);       \
-       (pg)->mdpage.pvh_list = NULL;                   \
-       (pg)->mdpage.pvh_attrs = 0;                     \
-} while (0)
-#endif
-
 #endif /* _MACHINE_PMAP_H_ */