Module Name: src Committed By: uebayasi Date: Wed Nov 10 03:36:29 UTC 2010
Modified Files: src/sys/arch/alpha/alpha [uebayasi-xip]: pmap.c src/sys/arch/amd64/amd64 [uebayasi-xip]: machdep.c src/sys/arch/arm/arm32 [uebayasi-xip]: pmap.c src/sys/arch/i386/i386 [uebayasi-xip]: machdep.c src/sys/arch/ia64/ia64 [uebayasi-xip]: pmap.c src/sys/arch/mips/mips [uebayasi-xip]: pmap.c src/sys/arch/sh3/sh3 [uebayasi-xip]: pmap.c Log Message: Always use VM_PHYSMEM_PTR(). To generate a diff of this commit: cvs rdiff -u -r1.252.2.6 -r1.252.2.7 src/sys/arch/alpha/alpha/pmap.c cvs rdiff -u -r1.141.2.5 -r1.141.2.6 src/sys/arch/amd64/amd64/machdep.c cvs rdiff -u -r1.211.2.19 -r1.211.2.20 src/sys/arch/arm/arm32/pmap.c cvs rdiff -u -r1.681.2.5 -r1.681.2.6 src/sys/arch/i386/i386/machdep.c cvs rdiff -u -r1.24.2.5 -r1.24.2.6 src/sys/arch/ia64/ia64/pmap.c cvs rdiff -u -r1.188.2.9 -r1.188.2.10 src/sys/arch/mips/mips/pmap.c cvs rdiff -u -r1.74.2.6 -r1.74.2.7 src/sys/arch/sh3/sh3/pmap.c 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/alpha/alpha/pmap.c diff -u src/sys/arch/alpha/alpha/pmap.c:1.252.2.6 src/sys/arch/alpha/alpha/pmap.c:1.252.2.7 --- src/sys/arch/alpha/alpha/pmap.c:1.252.2.6 Sat Nov 6 08:08:12 2010 +++ src/sys/arch/alpha/alpha/pmap.c Wed Nov 10 03:36:25 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.252.2.6 2010/11/06 08:08:12 uebayasi Exp $ */ +/* $NetBSD: pmap.c,v 1.252.2.7 2010/11/10 03:36:25 uebayasi Exp $ */ /*- * Copyright (c) 1998, 1999, 2000, 2001, 2007, 2008 The NetBSD Foundation, Inc. @@ -141,7 +141,7 @@ #include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.252.2.6 2010/11/06 08:08:12 uebayasi Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.252.2.7 2010/11/10 03:36:25 uebayasi Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -1064,7 +1064,7 @@ vm_nphysseg--; for (x = bank; x < vm_nphysseg; x++) { /* structure copy */ - vm_physmem_ptrs[x] = vm_physmem_ptrs[x + 1]; + *VM_PHYSMEM_PTR(x) = *VM_PHYSMEM_PTR(x + 1); } } Index: src/sys/arch/amd64/amd64/machdep.c diff -u src/sys/arch/amd64/amd64/machdep.c:1.141.2.5 src/sys/arch/amd64/amd64/machdep.c:1.141.2.6 --- src/sys/arch/amd64/amd64/machdep.c:1.141.2.5 Sat Nov 6 08:08:12 2010 +++ src/sys/arch/amd64/amd64/machdep.c Wed Nov 10 03:36:26 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.141.2.5 2010/11/06 08:08:12 uebayasi Exp $ */ +/* $NetBSD: machdep.c,v 1.141.2.6 2010/11/10 03:36:26 uebayasi Exp $ */ /*- * Copyright (c) 1996, 1997, 1998, 2000, 2006, 2007, 2008 @@ -107,7 +107,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.141.2.5 2010/11/06 08:08:12 uebayasi Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.141.2.6 2010/11/10 03:36:26 uebayasi Exp $"); /* #define XENDEBUG_LOW */ @@ -1182,7 +1182,7 @@ /* Remove the last segment if it now has no pages. */ if (vps->start == vps->end) { for (vm_nphysseg--; x < vm_nphysseg; x++) - vm_physmem_ptrs[x] = vm_physmem_ptrs[x + 1]; + *VM_PHYSMEM_PTR(x) = *VM_PHYSMEM_PTR(x + 1); } /* Now find where the new avail_end is. */ Index: src/sys/arch/arm/arm32/pmap.c diff -u src/sys/arch/arm/arm32/pmap.c:1.211.2.19 src/sys/arch/arm/arm32/pmap.c:1.211.2.20 --- src/sys/arch/arm/arm32/pmap.c:1.211.2.19 Sat Nov 6 08:08:14 2010 +++ src/sys/arch/arm/arm32/pmap.c Wed Nov 10 03:36:26 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.211.2.19 2010/11/06 08:08:14 uebayasi Exp $ */ +/* $NetBSD: pmap.c,v 1.211.2.20 2010/11/10 03:36:26 uebayasi Exp $ */ /* * Copyright 2003 Wasabi Systems, Inc. @@ -212,7 +212,7 @@ #include <machine/param.h> #include <arm/arm32/katelib.h> -__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.211.2.19 2010/11/06 08:08:14 uebayasi Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.211.2.20 2010/11/10 03:36:26 uebayasi Exp $"); #define VM_PAGE_TO_MD(pg) (&(pg)->mdpage) @@ -6649,7 +6649,7 @@ } KASSERT(mask == 0); for (i = 0; i < vm_nphysseg; i++) { - ps = vm_physmem_ptrs[i]; + ps = VM_PHYSMEM_PTR(i); if (ps->avail_start == atop(pv->pv_pa + pv->pv_size) && pv->pv_va + pv->pv_size <= ptoa(ps->avail_end)) { rpv->pv_va = pv->pv_va; @@ -6668,7 +6668,7 @@ */ if (ps->avail_start == ps->avail_end) { for (--vm_nphysseg; i < vm_nphysseg; i++, ps++) - ps[0] = ps[1]; + *(ps[0]) = *(ps[1]); } memset((void *)rpv->pv_va, 0, rpv->pv_size); return; Index: src/sys/arch/i386/i386/machdep.c diff -u src/sys/arch/i386/i386/machdep.c:1.681.2.5 src/sys/arch/i386/i386/machdep.c:1.681.2.6 --- src/sys/arch/i386/i386/machdep.c:1.681.2.5 Sat Nov 6 08:08:18 2010 +++ src/sys/arch/i386/i386/machdep.c Wed Nov 10 03:36:27 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.681.2.5 2010/11/06 08:08:18 uebayasi Exp $ */ +/* $NetBSD: machdep.c,v 1.681.2.6 2010/11/10 03:36:27 uebayasi Exp $ */ /*- * Copyright (c) 1996, 1997, 1998, 2000, 2004, 2006, 2008, 2009 @@ -67,7 +67,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.681.2.5 2010/11/06 08:08:18 uebayasi Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.681.2.6 2010/11/10 03:36:27 uebayasi Exp $"); #include "opt_beep.h" #include "opt_compat_ibcs2.h" @@ -1209,7 +1209,7 @@ /* Remove the last segment if it now has no pages. */ if (vps->start == vps->end) { for (--vm_nphysseg; x < vm_nphysseg; x++) - vm_physmem_ptrs[x] = vm_physmem_ptrs[x + 1]; + *VM_PHYSMEM_PTR(x) = *VM_PHYSMEM_PTR(x + 1); } /* Now find where the new avail_end is. */ Index: src/sys/arch/ia64/ia64/pmap.c diff -u src/sys/arch/ia64/ia64/pmap.c:1.24.2.5 src/sys/arch/ia64/ia64/pmap.c:1.24.2.6 --- src/sys/arch/ia64/ia64/pmap.c:1.24.2.5 Sat Nov 6 08:08:20 2010 +++ src/sys/arch/ia64/ia64/pmap.c Wed Nov 10 03:36:27 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.24.2.5 2010/11/06 08:08:20 uebayasi Exp $ */ +/* $NetBSD: pmap.c,v 1.24.2.6 2010/11/10 03:36:27 uebayasi Exp $ */ /*- @@ -85,7 +85,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.24.2.5 2010/11/06 08:08:20 uebayasi Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.24.2.6 2010/11/10 03:36:27 uebayasi Exp $"); #include "opt_xip.h" @@ -376,7 +376,7 @@ vm_nphysseg--; for (x = lcv; x < vm_nphysseg; x++) { /* structure copy */ - vm_physmem_ptrs[x] = vm_physmem_ptrs[x + 1]; + *VM_PHYSMEM_PTR(x) = *VM_PHYSMEM_PTR(x + 1); } } Index: src/sys/arch/mips/mips/pmap.c diff -u src/sys/arch/mips/mips/pmap.c:1.188.2.9 src/sys/arch/mips/mips/pmap.c:1.188.2.10 --- src/sys/arch/mips/mips/pmap.c:1.188.2.9 Sat Nov 6 08:08:20 2010 +++ src/sys/arch/mips/mips/pmap.c Wed Nov 10 03:36:28 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.188.2.9 2010/11/06 08:08:20 uebayasi Exp $ */ +/* $NetBSD: pmap.c,v 1.188.2.10 2010/11/10 03:36:28 uebayasi Exp $ */ /*- * Copyright (c) 1998, 2001 The NetBSD Foundation, Inc. @@ -67,7 +67,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.188.2.9 2010/11/06 08:08:20 uebayasi Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.188.2.10 2010/11/10 03:36:28 uebayasi Exp $"); /* * Manages physical address maps. @@ -478,7 +478,7 @@ vm_nphysseg--; for (x = bank; x < vm_nphysseg; x++) { /* structure copy */ - vm_physmem_ptrs[x] = vm_physmem_ptrs[x + 1]; + *VM_PHYSMEM_PTR(x) = VM_PHYSMEM_PTR(x + 1); } } Index: src/sys/arch/sh3/sh3/pmap.c diff -u src/sys/arch/sh3/sh3/pmap.c:1.74.2.6 src/sys/arch/sh3/sh3/pmap.c:1.74.2.7 --- src/sys/arch/sh3/sh3/pmap.c:1.74.2.6 Sat Nov 6 08:08:22 2010 +++ src/sys/arch/sh3/sh3/pmap.c Wed Nov 10 03:36:28 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.74.2.6 2010/11/06 08:08:22 uebayasi Exp $ */ +/* $NetBSD: pmap.c,v 1.74.2.7 2010/11/10 03:36:28 uebayasi Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.74.2.6 2010/11/06 08:08:22 uebayasi Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.74.2.7 2010/11/10 03:36:28 uebayasi Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -154,7 +154,7 @@ vm_nphysseg--; KDASSERT(vm_nphysseg > 0); for (j = i; i < vm_nphysseg; j++) - vm_physmem_ptrs[j] = vm_physmem_ptrs[j + 1]; + *VM_PHYSMEM_PTR(j) = *VM_PHYSMEM_PTR(j + 1); } va = SH3_PHYS_TO_P1SEG(pa);