6 files changed, 9 insertions, 23 deletions
diff --git a/sys/arch/arm/include/vmparam.h b/sys/arch/arm/include/vmparam.h
index 5eb0e3ccabf..8aa0fcaf4bc 100644
--- a/sys/arch/arm/include/vmparam.h
+++ b/sys/arch/arm/include/vmparam.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vmparam.h,v 1.9 2014/01/23 22:06:29 miod Exp $	*/
+/*	$OpenBSD: vmparam.h,v 1.10 2014/01/24 05:21:19 miod Exp $	*/
 /*	$NetBSD: vmparam.h,v 1.18 2003/05/21 18:04:44 thorpej Exp $	*/
 
 /*
@@ -101,8 +101,6 @@
 #define	VM_MIN_KERNEL_ADDRESS	((vaddr_t) ARM_KERNEL_BASE)
 #define	VM_MAX_KERNEL_ADDRESS	((vaddr_t) 0xffffffff)
 
-#ifdef _KERNEL
-
 /*
  * pmap-specific data store in the vm_page structure.
  */
@@ -131,6 +129,4 @@ do {									\
 	(pg)->mdpage.k_mappings = 0;					\
 } while (/*CONSTCOND*/0)
 
-#endif /* _KERNEL */
-
 #endif /* _ARM_VMPARAM_H_ */
diff --git a/sys/arch/hppa/include/vmparam.h b/sys/arch/hppa/include/vmparam.h
index e6755fa0b70..c2a528d2e5a 100644
--- a/sys/arch/hppa/include/vmparam.h
+++ b/sys/arch/hppa/include/vmparam.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vmparam.h,v 1.40 2014/01/23 22:06:29 miod Exp $	*/
+/*	$OpenBSD: vmparam.h,v 1.41 2014/01/24 05:21:19 miod Exp $	*/
 
 /* 
  * Copyright (c) 1988-1994, The University of Utah and
@@ -92,7 +92,7 @@
 
 #define	VM_PHYSSEG_NOADD	/* XXX until uvm code is fixed */
 
-#if defined(_KERNEL) && !defined(_LOCORE)
+#if !defined(_LOCORE)
 
 #include <sys/lock.h>
 
diff --git a/sys/arch/hppa64/include/vmparam.h b/sys/arch/hppa64/include/vmparam.h
index 6023b207ade..a8d4a6329c8 100644
--- a/sys/arch/hppa64/include/vmparam.h
+++ b/sys/arch/hppa64/include/vmparam.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vmparam.h,v 1.8 2014/01/23 22:06:29 miod Exp $	*/
+/*	$OpenBSD: vmparam.h,v 1.9 2014/01/24 05:21:19 miod Exp $	*/
 
 /* 
  * Copyright (c) 1988-1994, The University of Utah and
@@ -92,7 +92,7 @@
 
 #define	VM_PHYSSEG_NOADD	/* XXX until uvm code is fixed */
 
-#if defined(_KERNEL) && !defined(_LOCORE)
+#if !defined(_LOCORE)
 
 #include <sys/lock.h>
 
diff --git a/sys/arch/macppc/include/vmparam.h b/sys/arch/macppc/include/vmparam.h
index b1f45019b4e..2160f020553 100644
--- a/sys/arch/macppc/include/vmparam.h
+++ b/sys/arch/macppc/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/24 05:21:19 miod Exp $	*/
 /*	$NetBSD: vmparam.h,v 1.1 1996/09/30 16:34:38 ws Exp $	*/
 
 /*-
@@ -101,8 +101,6 @@ extern vaddr_t ppc_kvm_stolen;
 #define	VM_PHYSSEG_STRAT	VM_PSTRAT_BSEARCH
 #define	VM_PHYSSEG_NOADD	/* can't add RAM after vm_mem_init */
 
-#ifdef _KERNEL
-
 struct pv_entry;
 struct vm_page_md {
 	LIST_HEAD(,pte_desc) pv_list;
@@ -113,6 +111,3 @@ struct vm_page_md {
 } while (0)
 
 #endif
-
-
-#endif
diff --git a/sys/arch/mips64/include/vmparam.h b/sys/arch/mips64/include/vmparam.h
index 17e59f5aece..bbf323b6f49 100644
--- a/sys/arch/mips64/include/vmparam.h
+++ b/sys/arch/mips64/include/vmparam.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vmparam.h,v 1.25 2014/01/23 22:06:29 miod Exp $	*/
+/*	$OpenBSD: vmparam.h,v 1.26 2014/01/24 05:21:19 miod Exp $	*/
 /*	$NetBSD: vmparam.h,v 1.5 1994/10/26 21:10:10 cgd Exp $	*/
 
 /*
@@ -109,7 +109,7 @@
 /* virtual sizes (bytes) for various kernel submaps */
 #define VM_PHYS_SIZE		(USRIOSIZE*PAGE_SIZE)
 
-#if defined(_KERNEL) && !defined(_LOCORE)
+#if !defined(_LOCORE)
 /*
  * pmap-specific data
  */
diff --git a/sys/arch/socppc/include/vmparam.h b/sys/arch/socppc/include/vmparam.h
index 05975b92504..8e04269ca9f 100644
--- a/sys/arch/socppc/include/vmparam.h
+++ b/sys/arch/socppc/include/vmparam.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vmparam.h,v 1.6 2014/01/23 22:06:29 miod Exp $	*/
+/*	$OpenBSD: vmparam.h,v 1.7 2014/01/24 05:21:19 miod Exp $	*/
 /*	$NetBSD: vmparam.h,v 1.1 1996/09/30 16:34:38 ws Exp $	*/
 
 /*-
@@ -97,8 +97,6 @@ extern vaddr_t ppc_kvm_stolen;
 #define	VM_PHYSSEG_NOADD
 #define	VM_PHYSSEG_STRAT	VM_PSTRAT_RANDOM
 
-#ifdef _KERNEL
-
 struct pv_entry;
 struct vm_page_md {
 	LIST_HEAD(,pte_desc) pv_list;
@@ -109,6 +107,3 @@ struct vm_page_md {
 } while (0)
 
 #endif
-
-
-#endif