diff options
| author | attilio <attilio@FreeBSD.org> | 2013-02-27 18:12:13 +0000 |
|---|---|---|
| committer | attilio <attilio@FreeBSD.org> | 2013-02-27 18:12:13 +0000 |
| commit | 8d28f9479090da520ef392412da9129ec48f85ea (patch) | |
| tree | 960a120b0bfa6e8ab680fe148604e67ac3880e7d /sys/powerpc/booke | |
| parent | 5661e1fe461be2da03359fdaaf886b1a1155062b (diff) | |
| download | FreeBSD-src-8d28f9479090da520ef392412da9129ec48f85ea.zip FreeBSD-src-8d28f9479090da520ef392412da9129ec48f85ea.tar.gz | |
Merge from vmobj-rwlock:
VM_OBJECT_LOCKED() macro is only used to implement a custom version
of lock assertions right now (which likely spread out thanks to
copy and paste).
Remove it and implement actual assertions.
Sponsored by: EMC / Isilon storage division
Reviewed by: alc
Tested by: pho
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 5172009..8e0b76f 100644 --- a/sys/powerpc/booke/pmap.c +++ b/sys/powerpc/booke/pmap.c @@ -1560,9 +1560,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, MA_OWNED); PMAP_LOCK_ASSERT(pmap, MA_OWNED); |
