3 files changed, 8 insertions, 7 deletions
diff --git a/sys/arch/alpha/include/pmap.h b/sys/arch/alpha/include/pmap.h
index 1a7047e55da..381d9ba355c 100644
--- a/sys/arch/alpha/include/pmap.h
+++ b/sys/arch/alpha/include/pmap.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pmap.h,v 1.22 2007/09/10 18:49:44 miod Exp $ */
+/* $OpenBSD: pmap.h,v 1.23 2007/12/14 18:32:20 deraadt Exp $ */
 /* $NetBSD: pmap.h,v 1.37 2000/11/19 03:16:35 thorpej Exp $ */
 
 /*-
@@ -82,6 +82,8 @@
 
 #include <machine/pte.h>
 
+#ifdef _KERNEL
+
 /*
  * Machine-dependent virtual memory state.
  *
@@ -161,8 +163,6 @@ struct pv_head {
 	"l3pt",								\
 }
 
-#ifdef _KERNEL
-
 #ifndef _LKM
 #if defined(NEW_SCC_DRIVER)
 #if defined(DEC_KN8AE)
diff --git a/sys/arch/hppa/include/pmap.h b/sys/arch/hppa/include/pmap.h
index a8acf4c59ad..8b5693e3093 100644
--- a/sys/arch/hppa/include/pmap.h
+++ b/sys/arch/hppa/include/pmap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.h,v 1.34 2007/09/10 18:49:44 miod Exp $	*/
+/*	$OpenBSD: pmap.h,v 1.35 2007/12/14 18:32:23 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2002-2004 Michael Shalayeff
@@ -33,6 +33,8 @@
 #include <uvm/uvm_pglist.h>
 #include <uvm/uvm_object.h>
 
+#ifdef	_KERNEL
+
 struct pmap {
 	struct uvm_object pm_obj;	/* object (lck by object lock) */
 #define	pm_lock	pm_obj.vmobjlock
@@ -70,8 +72,6 @@ struct vp_entry {
 	u_int	vp_ptr;
 };
 
-#ifdef	_KERNEL
-
 extern void gateway_page(void);
 extern struct pmap kernel_pmap_store;
 
diff --git a/sys/arch/sparc64/include/pmap.h b/sys/arch/sparc64/include/pmap.h
index 9d8007d7fa0..f23ae80b702 100644
--- a/sys/arch/sparc64/include/pmap.h
+++ b/sys/arch/sparc64/include/pmap.h
@@ -107,6 +107,8 @@ extern struct page_size_map page_size_map[];
 #define va_to_dir(v)	(int)((((paddr_t)(v))>>PDSHIFT)&PDMASK)
 #define va_to_pte(v)	(int)((((paddr_t)(v))>>PTSHIFT)&PTMASK)
 
+#ifdef	_KERNEL
+
 struct pmap {
 	int pm_ctx;		/* Current context */
 	int pm_refs;		/* ref count */
@@ -152,7 +154,6 @@ typedef	struct pmap *pmap_t;
  */
 #define PMAP_IOENC(io)	0
 
-#ifdef	_KERNEL
 extern struct pmap kernel_pmap_;
 #define	pmap_kernel()	(&kernel_pmap_)