Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 14 Oct 2012 03:40:09 +0000 (UTC)
From:      Alan Cox <alc@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r241520 - head/sys/mips/mips
Message-ID:  <201210140340.q9E3e9rN077300@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210140340.q9E3e9rN077300>