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/aim | |
| 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/aim')
| -rw-r--r-- | sys/powerpc/aim/mmu_oea.c | 5 | ||||
| -rw-r--r-- | sys/powerpc/aim/mmu_oea64.c | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/sys/powerpc/aim/mmu_oea.c b/sys/powerpc/aim/mmu_oea.c index cd0f97c..555ccd7 100644 --- a/sys/powerpc/aim/mmu_oea.c +++ b/sys/powerpc/aim/mmu_oea.c @@ -1122,9 +1122,8 @@ moea_enter_locked(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, if (pmap_bootstrapped) rw_assert(&pvh_global_lock, RA_WLOCKED); PMAP_LOCK_ASSERT(pmap, MA_OWNED); - KASSERT((m->oflags & (VPO_UNMANAGED | VPO_BUSY)) != 0 || - VM_OBJECT_LOCKED(m->object), - ("moea_enter_locked: page %p is not busy", m)); + if ((m->oflags & (VPO_UNMANAGED | VPO_BUSY)) == 0) + VM_OBJECT_LOCK_ASSERT(m->object, RA_WLOCKED); /* XXX change the pvo head for fake pages */ if ((m->oflags & VPO_UNMANAGED) != 0) { diff --git a/sys/powerpc/aim/mmu_oea64.c b/sys/powerpc/aim/mmu_oea64.c index 8660e88..450d439 100644 --- a/sys/powerpc/aim/mmu_oea64.c +++ b/sys/powerpc/aim/mmu_oea64.c @@ -1184,9 +1184,8 @@ moea64_enter(mmu_t mmu, pmap_t pmap, vm_offset_t va, vm_page_t m, pvo_flags = PVO_MANAGED; } - KASSERT((m->oflags & (VPO_UNMANAGED | VPO_BUSY)) != 0 || - VM_OBJECT_LOCKED(m->object), - ("moea64_enter: page %p is not busy", m)); + if ((m->oflags & (VPO_UNMANAGED | VPO_BUSY)) == 0) + VM_OBJECT_LOCK_ASSERT(m->object, RA_WLOCKED); /* XXX change the pvo head for fake pages */ if ((m->oflags & VPO_UNMANAGED) != 0) { |
