From owner-svn-src-head@FreeBSD.ORG  Wed Mar 14 20:19:50 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 833E3106564A;
	Wed, 14 Mar 2012 20:19:50 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 590158FC0A;
	Wed, 14 Mar 2012 20:19:50 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2EKJort029714;
	Wed, 14 Mar 2012 20:19:50 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2EKJoCX029711;
	Wed, 14 Mar 2012 20:19:50 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201203142019.q2EKJoCX029711@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Wed, 14 Mar 2012 20:19:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r232980 - head/sys/powerpc/aim
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Mar 2012 20:19:50 -0000

Author: nwhitehorn
Date: Wed Mar 14 20:19:49 2012
New Revision: 232980
URL: http://svn.freebsd.org/changeset/base/232980

Log:
  Use LIST_FOREACH_SAFE() instead of LIST_FOREACH() in pmap_remove(), since
  the point of this loop is to remove elements. This worked by accident before.
  
  MFC after:	2 days

Modified:
  head/sys/powerpc/aim/mmu_oea.c
  head/sys/powerpc/aim/mmu_oea64.c

Modified: head/sys/powerpc/aim/mmu_oea.c
==============================================================================
--- head/sys/powerpc/aim/mmu_oea.c	Wed Mar 14 18:47:41 2012	(r232979)
+++ head/sys/powerpc/aim/mmu_oea.c	Wed Mar 14 20:19:49 2012	(r232980)
@@ -1794,7 +1794,7 @@ moea_release(mmu_t mmu, pmap_t pmap)
 void
 moea_remove(mmu_t mmu, pmap_t pm, vm_offset_t sva, vm_offset_t eva)
 {
-	struct	pvo_entry *pvo;
+	struct	pvo_entry *pvo, *tpvo;
 	int	pteidx;
 
 	vm_page_lock_queues();
@@ -1806,7 +1806,7 @@ moea_remove(mmu_t mmu, pmap_t pm, vm_off
 				moea_pvo_remove(pvo, pteidx);
 		}
 	} else {
-		LIST_FOREACH(pvo, &pm->pmap_pvo, pvo_plink) {
+		LIST_FOREACH_SAFE(pvo, &pm->pmap_pvo, pvo_plink, tpvo) {
 			if (PVO_VADDR(pvo) < sva || PVO_VADDR(pvo) >= eva)
 				continue;
 			moea_pvo_remove(pvo, -1);

Modified: head/sys/powerpc/aim/mmu_oea64.c
==============================================================================
--- head/sys/powerpc/aim/mmu_oea64.c	Wed Mar 14 18:47:41 2012	(r232979)
+++ head/sys/powerpc/aim/mmu_oea64.c	Wed Mar 14 20:19:49 2012	(r232980)
@@ -2039,7 +2039,7 @@ moea64_release(mmu_t mmu, pmap_t pmap)
 void
 moea64_remove(mmu_t mmu, pmap_t pm, vm_offset_t sva, vm_offset_t eva)
 {
-	struct	pvo_entry *pvo;
+	struct	pvo_entry *pvo, *tpvo;
 
 	vm_page_lock_queues();
 	PMAP_LOCK(pm);
@@ -2050,7 +2050,7 @@ moea64_remove(mmu_t mmu, pmap_t pm, vm_o
 				moea64_pvo_remove(mmu, pvo);
 		}
 	} else {
-		LIST_FOREACH(pvo, &pm->pmap_pvo, pvo_plink) {
+		LIST_FOREACH_SAFE(pvo, &pm->pmap_pvo, pvo_plink, tpvo) {
 			if (PVO_VADDR(pvo) < sva || PVO_VADDR(pvo) >= eva)
 				continue;
 			moea64_pvo_remove(mmu, pvo);