From owner-svn-src-head@FreeBSD.ORG  Sun Oct 14 03:40:09 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 90440915;
 Sun, 14 Oct 2012 03:40:09 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id 78F008FC0A;
 Sun, 14 Oct 2012 03:40:09 +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 q9E3e9iQ077302;
 Sun, 14 Oct 2012 03:40:09 GMT (envelope-from alc@svn.freebsd.org)
Received: (from alc@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9E3e9rN077300;
 Sun, 14 Oct 2012 03:40:09 GMT (envelope-from alc@svn.freebsd.org)
Message-Id: <201210140340.q9E3e9rN077300@svn.freebsd.org>
From: Alan Cox <alc@FreeBSD.org>
Date: Sun, 14 Oct 2012 03:40:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r241520 - head/sys/mips/mips
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Sun, 14 Oct 2012 03:40:09 -0000

Author: alc
Date: Sun Oct 14 03:40:08 2012
New Revision: 241520
URL: http://svn.freebsd.org/changeset/base/241520

Log:
  Correct an error in pmap_pv_reclaim().  It can legitimately encounter
  wired mappings.  If it does, it should just skip them.

Modified:
  head/sys/mips/mips/pmap.c

Modified: head/sys/mips/mips/pmap.c
==============================================================================
--- head/sys/mips/mips/pmap.c	Sat Oct 13 23:54:26 2012	(r241519)
+++ head/sys/mips/mips/pmap.c	Sun Oct 14 03:40:08 2012	(r241520)
@@ -1434,8 +1434,8 @@ pmap_pv_reclaim(pmap_t locked_pmap)
 				    ("pmap_pv_reclaim: pde"));
 				pte = pmap_pde_to_pte(pde, va);
 				oldpte = *pte;
-				KASSERT(!pte_test(&oldpte, PTE_W),
-				    ("wired pte for unwired page"));
+				if (pte_test(&oldpte, PTE_W))
+					continue;
 				if (is_kernel_pmap(pmap))
 					*pte = PTE_G;
 				else