diff options
| author | attilio <attilio@FreeBSD.org> | 2013-02-27 18:23:12 +0000 |
|---|---|---|
| committer | attilio <attilio@FreeBSD.org> | 2013-02-27 18:23:12 +0000 |
| commit | 6ff1954532678bdc14498c2a61e2b749acb17398 (patch) | |
| tree | 88985dbf58a87b061427a70d3a82819d976225c2 /sys/i386 | |
| parent | cbe7c0e1675e776d5cb08ccbfff3266adc6b0b8b (diff) | |
| download | FreeBSD-src-6ff1954532678bdc14498c2a61e2b749acb17398.zip FreeBSD-src-6ff1954532678bdc14498c2a61e2b749acb17398.tar.gz | |
MFC
Diffstat (limited to 'sys/i386')
| -rw-r--r-- | sys/i386/i386/pmap.c | 5 | ||||
| -rw-r--r-- | sys/i386/xen/pmap.c | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c index 5b784ee..8a3e71f 100644 --- a/sys/i386/i386/pmap.c +++ b/sys/i386/i386/pmap.c @@ -3519,9 +3519,8 @@ pmap_enter(pmap_t pmap, vm_offset_t va, vm_prot_t access, vm_page_t m, KASSERT(va < UPT_MIN_ADDRESS || va >= UPT_MAX_ADDRESS, ("pmap_enter: invalid to pmap_enter page table pages (va: 0x%x)", va)); - KASSERT((m->oflags & (VPO_UNMANAGED | VPO_BUSY)) != 0 || - VM_OBJECT_LOCKED(m->object), - ("pmap_enter: page %p is not busy", m)); + if ((m->oflags & (VPO_UNMANAGED | VPO_BUSY)) == 0) + VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED); mpte = NULL; diff --git a/sys/i386/xen/pmap.c b/sys/i386/xen/pmap.c index a8f11a4..4989e07 100644 --- a/sys/i386/xen/pmap.c +++ b/sys/i386/xen/pmap.c @@ -2666,9 +2666,8 @@ pmap_enter(pmap_t pmap, vm_offset_t va, vm_prot_t access, vm_page_t m, KASSERT(va < UPT_MIN_ADDRESS || va >= UPT_MAX_ADDRESS, ("pmap_enter: invalid to pmap_enter page table pages (va: 0x%x)", va)); - KASSERT((m->oflags & (VPO_UNMANAGED | VPO_BUSY)) != 0 || - VM_OBJECT_LOCKED(m->object), - ("pmap_enter: page %p is not busy", m)); + if ((m->oflags & (VPO_UNMANAGED | VPO_BUSY)) == 0) + VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED); mpte = NULL; |
