Module Name: src
Committed By: uebayasi
Date: Tue Nov 2 06:07:06 UTC 2010
Modified Files:
src/sys/arch/arm/arm32: mem.c
src/sys/arch/arm/include/arm32: pmap.h
Log Message:
Fix build of evbarm.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/arm/arm32/mem.c
cvs rdiff -u -r1.95 -r1.96 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.27 src/sys/arch/arm/arm32/mem.c:1.28
--- src/sys/arch/arm/arm32/mem.c:1.27 Sat Oct 30 18:35:38 2010
+++ src/sys/arch/arm/arm32/mem.c Tue Nov 2 06:07:05 2010
@@ -1,4 +1,4 @@
-/* $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
@@ -76,7 +76,7 @@
#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>
@@ -146,7 +146,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(VM_PAGE_TO_MD(pg)))
o = VM_PAGE_TO_MD(pg)->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.95 src/sys/arch/arm/include/arm32/pmap.h:1.96
--- src/sys/arch/arm/include/arm32/pmap.h:1.95 Wed Jun 16 22:06:53 2010
+++ src/sys/arch/arm/include/arm32/pmap.h Tue Nov 2 06:07:06 2010
@@ -1,4 +1,4 @@
-/* $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.
@@ -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 */
