[src/uebayasi-xip]: src/sys/arch pg->mdpage -> VM_PAGE_TO_MD(pg)

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

details:   https://anonhg.NetBSD.org/src/rev/cdea98e15305
branches:  uebayasi-xip
changeset: 751599:cdea98e15305
user:      uebayasi <uebayasi%NetBSD.org@localhost>
date:      Thu Feb 25 02:57:17 2010 +0000

description:
pg->mdpage -> VM_PAGE_TO_MD(pg)

diffstat:

 sys/arch/arm/arm32/mem.c |  8 +++++---
 sys/arch/x86/x86/pmap.c  |  6 +++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diffs (58 lines):

diff -r 39e19a0ab6c0 -r cdea98e15305 sys/arch/arm/arm32/mem.c
--- a/sys/arch/arm/arm32/mem.c  Wed Feb 24 16:22:58 2010 +0000
+++ b/sys/arch/arm/arm32/mem.c  Thu Feb 25 02:57:17 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mem.c,v 1.26.6.1 2010/02/10 14:20:23 uebayasi Exp $    */
+/*     $NetBSD: mem.c,v 1.26.6.2 2010/02/25 03:19:51 uebayasi Exp $    */
 
 /*
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -74,9 +74,11 @@
 
 #include "opt_arm32_pmap.h"
 #include "opt_compat_netbsd.h"
+#include "opt_device_page.h"
+#include "opt_xip.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mem.c,v 1.26.6.1 2010/02/10 14:20:23 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mem.c,v 1.26.6.2 2010/02/25 03:19:51 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
@@ -144,7 +146,7 @@
                        {
                                struct vm_page *pg;
                                pg = PHYS_TO_VM_PAGE(trunc_page(v));
-                               if (pg != NULL && pmap_is_page_colored_p(&pg->mdpage))
+                               if (pg != NULL && pmap_is_page_colored_p(VM_PAGE_TO_MD(pg)))
                                        o = pg->mdpage.pvh_attrs;
                                else
                                        o = v;
diff -r 39e19a0ab6c0 -r cdea98e15305 sys/arch/x86/x86/pmap.c
--- a/sys/arch/x86/x86/pmap.c   Wed Feb 24 16:22:58 2010 +0000
+++ b/sys/arch/x86/x86/pmap.c   Thu Feb 25 02:57:17 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.100 2010/01/31 00:43:37 hubertf Exp $       */
+/*     $NetBSD: pmap.c,v 1.100.2.1 2010/02/25 02:57:17 uebayasi Exp $  */
 
 /*
  * Copyright (c) 2007 Manuel Bouyer.
@@ -149,7 +149,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.100 2010/01/31 00:43:37 hubertf Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.100.2.1 2010/02/25 02:57:17 uebayasi Exp $");
 
 #include "opt_user_ldt.h"
 #include "opt_lockdebug.h"
@@ -415,7 +415,7 @@
 paddr_t pmap_pa_end;   /* PA of last physical page for this domain */
 #endif /* XEN */
 
-#define        VM_PAGE_TO_PP(pg)       (&(pg)->mdpage.mp_pp)
+#define        VM_PAGE_TO_PP(pg)       (&VM_PAGE_TO_MD(pg)->mp_pp)
 
 #define        pp_lock(pp)     mutex_spin_enter(&(pp)->pp_lock)
 #define        pp_unlock(pp)   mutex_spin_exit(&(pp)->pp_lock)