 @@ -1,14 +1,14 @@
-/*	$NetBSD: mem.c,v 1.27 2010/10/30 18:35:38 uebayasi Exp $	*/
+/*	$NetBSD: mem.c,v 1.28 2010/11/02 06:07:05 uebayasi Exp $	*/
 /*
  * Copyright (c) 1982, 1986, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -66,27 +66,27 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 /*
  * Memory special file
  */
 #include "opt_arm32_pmap.h"
 #include "opt_compat_netbsd.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mem.c,v 1.27 2010/10/30 18:35:38 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mem.c,v 1.28 2010/11/02 06:07:05 uebayasi Exp $");
 #include <sys/param.h>
 #include <sys/conf.h>
 #include <sys/buf.h>
 #include <sys/systm.h>
 #include <sys/uio.h>
 #include <sys/malloc.h>
 #include <sys/proc.h>
 #include <sys/fcntl.h>
 #include <sys/kauth.h>
 #include <machine/cpu.h>
 @@ -136,27 +136,27 @@ mmrw(dev_t dev, struct uio *uio, int fla
 			continue;
+		}
 		switch (minor(dev)) {
 		case DEV_MEM:
 			v = uio->uio_offset;
 			prot = uio->uio_rw == UIO_READ ? VM_PROT_READ :
 			    VM_PROT_WRITE;
 			m = memhook;
 #ifdef PMAP_CACHE_VIPT
+			{
 				struct vm_page *pg;
 				pg = PHYS_TO_VM_PAGE(trunc_page(v));
-				if (pg != NULL && pmap_is_page_colored_p(pg))
+				if (pg != NULL && pmap_is_page_colored_p(VM_PAGE_TO_MD(pg)))
 					o = VM_PAGE_TO_MD(pg)->pvh_attrs;
 				else
 					o = v;
 				m += o & arm_cache_prefer_mask;
+			}
 #endif
 			mutex_enter(&memlock);
 			pmap_enter(pmap_kernel(), m,
 			    trunc_page(v), prot, prot|PMAP_WIRED);
 			pmap_update(pmap_kernel());
 			o = uio->uio_offset & PGOFSET;
 			c = min(uio->uio_resid, (int)(PAGE_SIZE - o));
 			error = uiomove((char *)m + o, c, uio);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pmap.h,v 1.95 2010/06/16 22:06:53 jmcneill Exp $	*/
+/*	$NetBSD: pmap.h,v 1.96 2010/11/02 06:07:06 uebayasi Exp $	*/
 /*
  * Copyright (c) 2002, 2003 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe & Steve C. Woodford for Wasabi Systems, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -262,28 +262,28 @@ extern pv_addr_t kernel_l1pt;
  */
 extern int		pmap_debug_level; /* Only exists if PMAP_DEBUG */
 /*
  * Macros that we need to export
  */
 #define	pmap_resident_count(pmap)	((pmap)->pm_stats.resident_count)
 #define	pmap_wired_count(pmap)		((pmap)->pm_stats.wired_count)
 #define	pmap_is_modified(pg)	\
 	(((pg)->mdpage.pvh_attrs & PVF_MOD) != 0)
 #define	pmap_is_referenced(pg)	\
 	(((pg)->mdpage.pvh_attrs & PVF_REF) != 0)
-#define	pmap_is_page_colored_p(pg)	\
+#define	pmap_is_page_colored_p(md)	\
-	(((pg)->mdpage.pvh_attrs & PVF_COLORED) != 0)
+	(((md)->pvh_attrs & PVF_COLORED) != 0)
 #define	pmap_copy(dp, sp, da, l, sa)	/* nothing */
 #define pmap_phys_address(ppn)		(arm_ptob((ppn)))
 /*
  * Functions that we need to export
  */
 void	pmap_procwr(struct proc *, vaddr_t, int);
 void	pmap_remove_all(pmap_t);
 bool	pmap_extract(pmap_t, vaddr_t, paddr_t *);
 #define	PMAP_NEED_PROCWR