diff options
| author | alc <alc@FreeBSD.org> | 2013-05-17 18:59:00 +0000 |
|---|---|---|
| committer | alc <alc@FreeBSD.org> | 2013-05-17 18:59:00 +0000 |
| commit | b55ba81a923ec8249c7d2fa1b3293816d5e8ef96 (patch) | |
| tree | b13c5a4ab2b5088ba94fba6876d45b5d7fec1fb0 /sys/powerpc | |
| parent | 2e6e8075ee0bbcdd43bcb42898d139ab71a295a9 (diff) | |
| download | FreeBSD-src-b55ba81a923ec8249c7d2fa1b3293816d5e8ef96.zip FreeBSD-src-b55ba81a923ec8249c7d2fa1b3293816d5e8ef96.tar.gz | |
Relax the object locking assertion in pmap_enter_locked().
Reviewed by: attilio
Sponsored by: EMC / Isilon Storage Division
Diffstat (limited to 'sys/powerpc')
| -rw-r--r-- | sys/powerpc/aim/mmu_oea.c | 2 | ||||
| -rw-r--r-- | sys/powerpc/aim/mmu_oea64.c | 2 | ||||
| -rw-r--r-- | sys/powerpc/booke/pmap.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sys/powerpc/aim/mmu_oea.c b/sys/powerpc/aim/mmu_oea.c index 56c0941..3c024de 100644 --- a/sys/powerpc/aim/mmu_oea.c +++ b/sys/powerpc/aim/mmu_oea.c @@ -1159,7 +1159,7 @@ moea_enter_locked(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, rw_assert(&pvh_global_lock, RA_WLOCKED); PMAP_LOCK_ASSERT(pmap, MA_OWNED); if ((m->oflags & (VPO_UNMANAGED | VPO_BUSY)) == 0) - VM_OBJECT_ASSERT_WLOCKED(m->object); + VM_OBJECT_ASSERT_LOCKED(m->object); /* 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 66194df..709501b 100644 --- a/sys/powerpc/aim/mmu_oea64.c +++ b/sys/powerpc/aim/mmu_oea64.c @@ -1261,7 +1261,7 @@ moea64_enter(mmu_t mmu, pmap_t pmap, vm_offset_t va, vm_page_t m, } if ((m->oflags & (VPO_UNMANAGED | VPO_BUSY)) == 0) - VM_OBJECT_ASSERT_WLOCKED(m->object); + VM_OBJECT_ASSERT_LOCKED(m->object); /* XXX change the pvo head for fake pages */ if ((m->oflags & VPO_UNMANAGED) != 0) { diff --git a/sys/powerpc/booke/pmap.c b/sys/powerpc/booke/pmap.c index b9f4838..a4de230 100644 --- a/sys/powerpc/booke/pmap.c +++ b/sys/powerpc/booke/pmap.c @@ -1564,7 +1564,7 @@ mmu_booke_enter_locked(mmu_t mmu, pmap_t pmap, vm_offset_t va, vm_page_t m, ("mmu_booke_enter_locked: user pmap, non user va")); } if ((m->oflags & (VPO_UNMANAGED | VPO_BUSY)) == 0) - VM_OBJECT_ASSERT_WLOCKED(m->object); + VM_OBJECT_ASSERT_LOCKED(m->object); PMAP_LOCK_ASSERT(pmap, MA_OWNED); |
