From owner-svn-src-user@FreeBSD.ORG  Mon Apr 19 19:49:39 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B49F11065689;
	Mon, 19 Apr 2010 19:49:39 +0000 (UTC)
	(envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A37E78FC21;
	Mon, 19 Apr 2010 19:49:39 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o3JJndow098406;
	Mon, 19 Apr 2010 19:49:39 GMT
	(envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3JJndQf098404;
	Mon, 19 Apr 2010 19:49:39 GMT
	(envelope-from jmallett@svn.freebsd.org)
Message-Id: <201004191949.o3JJndQf098404@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Mon, 19 Apr 2010 19:49:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r206857 - user/jmallett/octeon/sys/mips/mips
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 19 Apr 2010 19:49:39 -0000

Author: jmallett
Date: Mon Apr 19 19:49:39 2010
New Revision: 206857
URL: http://svn.freebsd.org/changeset/base/206857

Log:
  Finally hit a pmap_kenter() of a still-valid address with a different mapping.
  Would be useful to track that down at some point.

Modified:
  user/jmallett/octeon/sys/mips/mips/pmap.c

Modified: user/jmallett/octeon/sys/mips/mips/pmap.c
==============================================================================
--- user/jmallett/octeon/sys/mips/mips/pmap.c	Mon Apr 19 19:29:33 2010	(r206856)
+++ user/jmallett/octeon/sys/mips/mips/pmap.c	Mon Apr 19 19:49:39 2010	(r206857)
@@ -719,7 +719,7 @@ pmap_extract_and_hold(pmap_t pmap, vm_of
 pmap_kenter(vm_offset_t va, vm_paddr_t pa)
 {
 	pt_entry_t *pte;
-	pt_entry_t npte;
+	pt_entry_t opte, npte;
 
 #ifdef PMAP_DEBUG
 	printf("pmap_kenter:  va: %p -> pa: %p\n", (void *)va, (void *)pa);
@@ -732,9 +732,13 @@ pmap_kenter(vm_offset_t va, vm_paddr_t p
 		npte |= PG_C_UC;
 
 	pte = pmap_pte(kernel_pmap, va);
-	KASSERT(!pte_test(pte, PG_V) || *pte == npte,
-		("pmap_kenter for %p with different valid entry", (void *)va));
+	opte = *pte;
 	*pte = npte;
+
+	if (pte_test(pte, PG_V) && opte != npte) {
+		/* XXX dcache wbinv?  */
+		pmap_update_page(kernel_pmap, va, npte);
+	}
 }
 
 /*