diff options
| author | attilio <attilio@FreeBSD.org> | 2013-02-20 10:51:34 +0000 |
|---|---|---|
| committer | attilio <attilio@FreeBSD.org> | 2013-02-20 10:51:34 +0000 |
| commit | 1f1e13ca0304c5d3cab0d4c118678ec546f935bc (patch) | |
| tree | 5b34b3c7cd00302d32a836920301b507e1a8f085 /sys/powerpc/booke | |
| parent | 6a2e2ce522a097de5dab15c95de81db5c42d8c36 (diff) | |
| download | FreeBSD-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/powerpc/booke')
| -rw-r--r-- | sys/powerpc/booke/pmap.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/powerpc/booke/pmap.c b/sys/powerpc/booke/pmap.c index 435960a..c3c18da 100644 --- a/sys/powerpc/booke/pmap.c +++ b/sys/powerpc/booke/pmap.c @@ -1561,9 +1561,8 @@ mmu_booke_enter_locked(mmu_t mmu, pmap_t pmap, vm_offset_t va, vm_page_t m, KASSERT((va <= VM_MAXUSER_ADDRESS), ("mmu_booke_enter_locked: user pmap, non user va")); } - KASSERT((m->oflags & (VPO_UNMANAGED | VPO_BUSY)) != 0 || - VM_OBJECT_LOCKED(m->object), - ("mmu_booke_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_LOCK_ASSERT(pmap, MA_OWNED); |
