From owner-p4-projects@FreeBSD.ORG  Thu Oct  5 13:53:52 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6D4FD16A417; Thu,  5 Oct 2006 13:53:52 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 3069416A403
	for <perforce@freebsd.org>; Thu,  5 Oct 2006 13:53:52 +0000 (UTC)
	(envelope-from cognet@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id EB0FD43D76
	for <perforce@freebsd.org>; Thu,  5 Oct 2006 13:53:51 +0000 (GMT)
	(envelope-from cognet@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k95DrpVI038274
	for <perforce@freebsd.org>; Thu, 5 Oct 2006 13:53:51 GMT
	(envelope-from cognet@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k95DrpXa038271
	for perforce@freebsd.org; Thu, 5 Oct 2006 13:53:51 GMT
	(envelope-from cognet@freebsd.org)
Date: Thu, 5 Oct 2006 13:53:51 GMT
Message-Id: <200610051353.k95DrpXa038271@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	cognet@freebsd.org using -f
From: Olivier Houchard <cognet@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 107307 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Oct 2006 13:53:52 -0000

http://perforce.freebsd.org/chv.cgi?CH=107307

Change 107307 by cognet@cognet on 2006/10/05 13:53:41

	Remove a non-working workaround in pmap_remove_pages(), add a more
	useful KASSERT instead.

Affected files ...

.. //depot/projects/arm/src/sys/arm/arm/pmap.c#26 edit

Differences ...

==== //depot/projects/arm/src/sys/arm/arm/pmap.c#26 (text+ko) ====

@@ -2783,13 +2783,8 @@
 		l2b = pmap_get_l2_bucket(pmap, pv->pv_va);
 		KASSERT(l2b != NULL, ("No L2 bucket in pmap_remove_pages"));
 		pt = &l2b->l2b_kva[l2pte_index(pv->pv_va)];
-		if ((*pt & L2_ADDR_MASK) == 0) {
-			npv = TAILQ_NEXT(pv, pv_plist);
-			TAILQ_REMOVE(&pmap->pm_pvlist, pv, pv_plist);
-			pmap_free_pv_entry(pv);
-			continue;
-		}
 		m = PHYS_TO_VM_PAGE(*pt & L2_ADDR_MASK);
+		KASSERT((vm_offset_t)m >= KERNBASE, ("Trying to access non-existent page va %x pte %x", va, *pt));
 		*pt = 0;
 		PTE_SYNC(pt);
 		npv = TAILQ_NEXT(pv, pv_plist);