diff options
| author | alc <alc@FreeBSD.org> | 2014-08-30 03:41:47 +0000 |
|---|---|---|
| committer | alc <alc@FreeBSD.org> | 2014-08-30 03:41:47 +0000 |
| commit | 30905aaa3363199bdebf8dfb71864425f42287a0 (patch) | |
| tree | 874f6e5b8360da6cca7a61730d0b3c643b91c4be /sys/ia64 | |
| parent | f4fd8ca123dc4ee8f99360e00b5196f563d90a41 (diff) | |
| download | FreeBSD-src-30905aaa3363199bdebf8dfb71864425f42287a0.zip FreeBSD-src-30905aaa3363199bdebf8dfb71864425f42287a0.tar.gz | |
Update an assertion to reflect the changes made in r270439. This is a
direct commit to stable/10 because ia64 is no longer supported by HEAD.
Reported by: marcel
Sponsored by: EMC / Isilon Storage Division
Diffstat (limited to 'sys/ia64')
| -rw-r--r-- | sys/ia64/ia64/pmap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/ia64/ia64/pmap.c b/sys/ia64/ia64/pmap.c index e3f368c..602090a 100644 --- a/sys/ia64/ia64/pmap.c +++ b/sys/ia64/ia64/pmap.c @@ -1713,8 +1713,8 @@ pmap_enter(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, va &= ~PAGE_MASK; KASSERT(va <= VM_MAX_KERNEL_ADDRESS, ("pmap_enter: toobig")); - KASSERT((m->oflags & VPO_UNMANAGED) != 0 || vm_page_xbusied(m), - ("pmap_enter: page %p is not busy", m)); + if ((m->oflags & VPO_UNMANAGED) == 0 && !vm_page_xbusied(m)) + VM_OBJECT_ASSERT_LOCKED(m->object); /* * Find (or create) a pte for the given mapping. |
