diff options
| author | alc <alc@FreeBSD.org> | 2010-06-11 15:49:39 +0000 |
|---|---|---|
| committer | alc <alc@FreeBSD.org> | 2010-06-11 15:49:39 +0000 |
| commit | 6a3535c3fa18af41cdca53d39cc5cfa30c33b489 (patch) | |
| tree | 550ff47684da099980515a2516e246ffd5339741 /sys/powerpc/booke/pmap.c | |
| parent | 36542ba7ce7973f7b9df1cef37c89721a3f722a8 (diff) | |
| download | FreeBSD-src-6a3535c3fa18af41cdca53d39cc5cfa30c33b489.zip FreeBSD-src-6a3535c3fa18af41cdca53d39cc5cfa30c33b489.tar.gz | |
Relax one of the new assertions in pmap_enter() a little. Specifically,
allow pmap_enter() to be performed on an unmanaged page that doesn't have
VPO_BUSY set. Having VPO_BUSY set really only matters for managed pages.
(See, for example, pmap_remove_write().)
Diffstat (limited to 'sys/powerpc/booke/pmap.c')
| -rw-r--r-- | sys/powerpc/booke/pmap.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/powerpc/booke/pmap.c b/sys/powerpc/booke/pmap.c index 2d368b4..02ce9aa 100644 --- a/sys/powerpc/booke/pmap.c +++ b/sys/powerpc/booke/pmap.c @@ -1558,7 +1558,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_BUSY) != 0 || VM_OBJECT_LOCKED(m->object), + KASSERT((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) != 0 || + (m->oflags & VPO_BUSY) != 0 || VM_OBJECT_LOCKED(m->object), ("mmu_booke_enter_locked: page %p is not busy", m)); PMAP_LOCK_ASSERT(pmap, MA_OWNED); |
