[src/uebayasi-xip]: src/sys/arch/arm A few more VM_PAGE_TO_MD().

[uebayasi <uebayasi%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/45e2e14f7dfe
branches:  uebayasi-xip
changeset: 751600:45e2e14f7dfe
user:      uebayasi <uebayasi%NetBSD.org@localhost>
date:      Thu Feb 25 03:30:22 2010 +0000

description:
A few more VM_PAGE_TO_MD().

diffstat:

 sys/arch/arm/arm32/mem.c          |   6 +++---
 sys/arch/arm/arm32/pmap.c         |  10 ++++++----
 sys/arch/arm/include/arm32/pmap.h |   7 ++++---
 3 files changed, 13 insertions(+), 10 deletions(-)

diffs (87 lines):

diff -r cdea98e15305 -r 45e2e14f7dfe sys/arch/arm/arm32/mem.c
--- a/sys/arch/arm/arm32/mem.c  Thu Feb 25 02:57:17 2010 +0000
+++ b/sys/arch/arm/arm32/mem.c  Thu Feb 25 03:30:22 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mem.c,v 1.26.6.2 2010/02/25 03:19:51 uebayasi Exp $    */
+/*     $NetBSD: mem.c,v 1.26.6.3 2010/02/25 03:30:22 uebayasi Exp $    */
 
 /*
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -78,7 +78,7 @@
 #include "opt_xip.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mem.c,v 1.26.6.2 2010/02/25 03:19:51 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mem.c,v 1.26.6.3 2010/02/25 03:30:22 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
@@ -147,7 +147,7 @@
                                struct vm_page *pg;
                                pg = PHYS_TO_VM_PAGE(trunc_page(v));
                                if (pg != NULL && pmap_is_page_colored_p(VM_PAGE_TO_MD(pg)))
-                                       o = pg->mdpage.pvh_attrs;
+                                       o = VM_PAGE_TO_MD(pg)->pvh_attrs;
                                else
                                        o = v;
                                m += o & arm_cache_prefer_mask;
diff -r cdea98e15305 -r 45e2e14f7dfe sys/arch/arm/arm32/pmap.c
--- a/sys/arch/arm/arm32/pmap.c Thu Feb 25 02:57:17 2010 +0000
+++ b/sys/arch/arm/arm32/pmap.c Thu Feb 25 03:30:22 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.211.2.8 2010/02/20 16:48:57 uebayasi Exp $  */
+/*     $NetBSD: pmap.c,v 1.211.2.9 2010/02/25 03:30:22 uebayasi Exp $  */
 
 /*
  * Copyright 2003 Wasabi Systems, Inc.
@@ -191,6 +191,8 @@
 #include "opt_ddb.h"
 #include "opt_lockdebug.h"
 #include "opt_multiprocessor.h"
+#include "opt_device_page.h"
+#include "opt_xip.h"
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -211,7 +213,7 @@
 #include <machine/param.h>
 #include <arm/arm32/katelib.h>
 
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.211.2.8 2010/02/20 16:48:57 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.211.2.9 2010/02/25 03:30:22 uebayasi Exp $");
 
 #ifdef PMAP_DEBUG
 
@@ -3343,8 +3345,8 @@
        struct vm_page_md *md = VM_PAGE_TO_MD(pg);
 
        NPDEBUG(PDB_KENTER,
-           printf("pmap_kenter_pa: va 0x%08lx, pa 0x%08lx, prot 0x%x\n",
-           va, pa, prot));
+           printf("pmap_kenter_pa: va 0x%08lx, pa 0x%08lx, prot 0x%x pg %p md %p\n",
+           va, pa, prot, pg, md));
 
        l2b = pmap_get_l2_bucket(pmap_kernel(), va);
        KDASSERT(l2b != NULL);
diff -r cdea98e15305 -r 45e2e14f7dfe sys/arch/arm/include/arm32/pmap.h
--- a/sys/arch/arm/include/arm32/pmap.h Thu Feb 25 02:57:17 2010 +0000
+++ b/sys/arch/arm/include/arm32/pmap.h Thu Feb 25 03:30:22 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.h,v 1.94.2.1 2010/02/10 14:20:23 uebayasi Exp $   */
+/*     $NetBSD: pmap.h,v 1.94.2.2 2010/02/25 03:30:22 uebayasi Exp $   */
 
 /*
  * Copyright (c) 2002, 2003 Wasabi Systems, Inc.
@@ -269,9 +269,10 @@
 #define        pmap_wired_count(pmap)          ((pmap)->pm_stats.wired_count)
 
 #define        pmap_is_modified(pg)    \
-       (((pg)->mdpage.pvh_attrs & PVF_MOD) != 0)
+       ((VM_PAGE_TO_MD(pg)->pvh_attrs & PVF_MOD) != 0)
 #define        pmap_is_referenced(pg)  \
-       (((pg)->mdpage.pvh_attrs & PVF_REF) != 0)
+       ((VM_PAGE_TO_MD(pg)->pvh_attrs & PVF_REF) != 0)
+
 #define        pmap_is_page_colored_p(md)      \
        (((md)->pvh_attrs & PVF_COLORED) != 0)