Module Name: src
Committed By: uebayasi
Date: Wed Feb 10 14:20:23 UTC 2010
Modified Files:
src/sys/arch/arm/arm32 [uebayasi-xip]: mem.c
src/sys/arch/arm/include/arm32 [uebayasi-xip]: pmap.h
Log Message:
Missing bits of pmap_is_page_colored_p() conversion.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.26.6.1 src/sys/arch/arm/arm32/mem.c
cvs rdiff -u -r1.94 -r1.94.2.1 src/sys/arch/arm/include/arm32/pmap.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm32/mem.c
diff -u src/sys/arch/arm/arm32/mem.c:1.26 src/sys/arch/arm/arm32/mem.c:1.26.6.1
--- src/sys/arch/arm/arm32/mem.c:1.26 Wed Nov 19 06:24:04 2008
+++ src/sys/arch/arm/arm32/mem.c Wed Feb 10 14:20:23 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: mem.c,v 1.26 2008/11/19 06:24:04 matt Exp $ */
+/* $NetBSD: mem.c,v 1.26.6.1 2010/02/10 14:20:23 uebayasi Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@@ -76,7 +76,7 @@
#include "opt_compat_netbsd.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mem.c,v 1.26 2008/11/19 06:24:04 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mem.c,v 1.26.6.1 2010/02/10 14:20:23 uebayasi Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -144,7 +144,7 @@
{
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(&pg->mdpage))
o = pg->mdpage.pvh_attrs;
else
o = v;
Index: src/sys/arch/arm/include/arm32/pmap.h
diff -u src/sys/arch/arm/include/arm32/pmap.h:1.94 src/sys/arch/arm/include/arm32/pmap.h:1.94.2.1
--- src/sys/arch/arm/include/arm32/pmap.h:1.94 Sun Dec 27 05:14:56 2009
+++ src/sys/arch/arm/include/arm32/pmap.h Wed Feb 10 14:20:23 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.94 2009/12/27 05:14:56 uebayasi Exp $ */
+/* $NetBSD: pmap.h,v 1.94.2.1 2010/02/10 14:20:23 uebayasi Exp $ */
/*
* Copyright (c) 2002, 2003 Wasabi Systems, Inc.
@@ -272,8 +272,8 @@
(((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) \
- (((pg)->mdpage.pvh_attrs & PVF_COLORED) != 0)
+#define pmap_is_page_colored_p(md) \
+ (((md)->pvh_attrs & PVF_COLORED) != 0)
#define pmap_copy(dp, sp, da, l, sa) /* nothing */
