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/sparc64 | |
| 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/sparc64')
| -rw-r--r-- | sys/sparc64/sparc64/pmap.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/sparc64/sparc64/pmap.c b/sys/sparc64/sparc64/pmap.c index 08f008c..f689b17 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, MA_OWNED); PMAP_STATS_INC(pmap_nenter); pa = VM_PAGE_TO_PHYS(m); |
