From: miod <miod@openbsd.org>
Date: Thu, 8 May 2014 21:31:56 +0000 (+0000)
Subject: Update #include list after not-so-recent uvm includes cleanups.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=9409f5e4534995fe12ad3b05acf8d8fbf721ef20;p=openbsd

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 d26a9b95b46..e00d1cd0b86 100644
--- 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_ */