summaryrefslogtreecommitdiffstats
path: root/sys/sparc64
diff options
context:
space:
mode:
authorattilio <attilio@FreeBSD.org>2013-02-20 10:51:34 +0000
committerattilio <attilio@FreeBSD.org>2013-02-20 10:51:34 +0000
commit1f1e13ca0304c5d3cab0d4c118678ec546f935bc (patch)
tree5b34b3c7cd00302d32a836920301b507e1a8f085 /sys/sparc64
parent6a2e2ce522a097de5dab15c95de81db5c42d8c36 (diff)
downloadFreeBSD-src-1f1e13ca0304c5d3cab0d4c118678ec546f935bc.zip
FreeBSD-src-1f1e13ca0304c5d3cab0d4c118678ec546f935bc.tar.gz
There is no need to use VM_OBJECT_LOCKED() as the assertion won't
make the check available in any case if INVARIANTS is switched off. Remove VM_OBJECT_LOCKED().
Diffstat (limited to 'sys/sparc64')
-rw-r--r--sys/sparc64/sparc64/pmap.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/sparc64/sparc64/pmap.c b/sys/sparc64/sparc64/pmap.c
index 9c6d6aa..9c0ed99 100644
--- a/sys/sparc64/sparc64/pmap.c
+++ b/sys/sparc64/sparc64/pmap.c
@@ -1494,9 +1494,8 @@ pmap_enter_locked(pmap_t pm, vm_offset_t va, vm_page_t m, vm_prot_t prot,
rw_assert(&tte_list_global_lock, RA_WLOCKED);
PMAP_LOCK_ASSERT(pm, MA_OWNED);
- KASSERT((m->oflags & (VPO_UNMANAGED | VPO_BUSY)) != 0 ||
- VM_OBJECT_LOCKED(m->object),
- ("pmap_enter_locked: page %p is not busy", m));
+ if ((m->oflags & (VPO_UNMANAGED | VPO_BUSY)) == 0)
+ VM_OBJECT_LOCK_ASSERT(m->object, RA_WLOCKED);
PMAP_STATS_INC(pmap_nenter);
pa = VM_PAGE_TO_PHYS(m);
OpenPOWER on IntegriCloud