summaryrefslogtreecommitdiffstats
path: root/sys/sparc64
diff options
context:
space:
mode:
authoralc <alc@FreeBSD.org>2010-06-11 15:49:39 +0000
committeralc <alc@FreeBSD.org>2010-06-11 15:49:39 +0000
commit6a3535c3fa18af41cdca53d39cc5cfa30c33b489 (patch)
tree550ff47684da099980515a2516e246ffd5339741 /sys/sparc64
parent36542ba7ce7973f7b9df1cef37c89721a3f722a8 (diff)
downloadFreeBSD-src-6a3535c3fa18af41cdca53d39cc5cfa30c33b489.zip
FreeBSD-src-6a3535c3fa18af41cdca53d39cc5cfa30c33b489.tar.gz
Relax one of the new assertions in pmap_enter() a little. Specifically,
allow pmap_enter() to be performed on an unmanaged page that doesn't have VPO_BUSY set. Having VPO_BUSY set really only matters for managed pages. (See, for example, pmap_remove_write().)
Diffstat (limited to 'sys/sparc64')
-rw-r--r--sys/sparc64/sparc64/pmap.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/sparc64/sparc64/pmap.c b/sys/sparc64/sparc64/pmap.c
index 736602c..caceb3f 100644
--- a/sys/sparc64/sparc64/pmap.c
+++ b/sys/sparc64/sparc64/pmap.c
@@ -1351,7 +1351,8 @@ pmap_enter_locked(pmap_t pm, vm_offset_t va, vm_page_t m, vm_prot_t prot,
mtx_assert(&vm_page_queue_mtx, MA_OWNED);
PMAP_LOCK_ASSERT(pm, MA_OWNED);
- KASSERT((m->oflags & VPO_BUSY) != 0 || VM_OBJECT_LOCKED(m->object),
+ KASSERT((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) != 0 ||
+ (m->oflags & VPO_BUSY) != 0 || VM_OBJECT_LOCKED(m->object),
("pmap_enter_locked: page %p is not busy", m));
PMAP_STATS_INC(pmap_nenter);
pa = VM_PAGE_TO_PHYS(m);
OpenPOWER on IntegriCloud