diff --git a/sys/arch/arm/include/arm32/pmap.h b/sys/arch/arm/include/arm32/pmap.h
index fc19976d4b9d..903ac8101678 100644
--- a/sys/arch/arm/include/arm32/pmap.h
+++ b/sys/arch/arm/include/arm32/pmap.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.h,v 1.90 2008/12/30 05:51:19 matt Exp $	*/
+/*	$NetBSD: pmap.h,v 1.91 2009/08/19 14:58:48 thorpej Exp $	*/
 
 /*
  * Copyright (c) 2002, 2003 Wasabi Systems, Inc.
@@ -290,9 +290,6 @@ bool	pmap_extract(pmap_t, vaddr_t, paddr_t *);
 
 #define	PMAP_NEED_PROCWR
 #define PMAP_GROWKERNEL		/* turn on pmap_growkernel interface */
-#define	PMAP_KMPAGE	0x00000040	/* Make uvm tell us when it allocates
-					 a page to be used for kernel memory */
-
 
 #if ARM_MMU_V6 > 0
 #define	PMAP_PREFER(hint, vap, sz, td)	pmap_prefer((hint), (vap), (td))
diff --git a/sys/uvm/uvm_pmap.h b/sys/uvm/uvm_pmap.h
index a1c9262779ca..60ec6fe58f33 100644
--- a/sys/uvm/uvm_pmap.h
+++ b/sys/uvm/uvm_pmap.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_pmap.h,v 1.28 2009/04/23 06:22:00 cegger Exp $	*/
+/*	$NetBSD: uvm_pmap.h,v 1.29 2009/08/19 14:58:48 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1991, 1993
@@ -96,20 +96,17 @@ typedef struct pmap_statistics	*pmap_statistics_t;
  * Flags passed to pmap_enter().  Note the bottom 3 bits are VM_PROT_*
  * bits, used to indicate the access type that was made (to seed modified
  * and referenced information).
+ *
+ * Flags marked [PA] are for pmap_kenter_pa() only.  Flags marked [BOTH]
+ * apply to pmap_kenter_pa() and pmap_enter().  All other flags are valid
+ * for pmap_enter() only.
  */
 #define	PMAP_WIRED	0x00000010	/* wired mapping */
 #define	PMAP_CANFAIL	0x00000020	/* can fail if resource shortage */
+#define	PMAP_KMPAGE	0x00000040	/* [PA] page used for kernel memory */
 
 #define	PMAP_MD_MASK	0xff000000	/* Machine-dependent bits */
 
-/*
- * Flags passed to pmap_kenter_pa().  Note the bottom 3 bits are VM_PROT_*
- * bits, used to indicate the access type.
- */
-#ifndef PMAP_KMPAGE
-#define	PMAP_KMPAGE	0x00000000	/* this is from the kmem allocator */
-#endif
-
 #ifndef PMAP_EXCLUDE_DECLS	/* Used in Sparc port to virtualize pmap mod */
 #ifdef _KERNEL
 __BEGIN_DECLS