diff options
| author | alc <alc@FreeBSD.org> | 2003-01-01 19:45:36 +0000 |
|---|---|---|
| committer | alc <alc@FreeBSD.org> | 2003-01-01 19:45:36 +0000 |
| commit | 0912d72a882e884ecbb8fbf26388308e79e5b302 (patch) | |
| tree | 8d9157d71238eaaadad1720591352dede3503a88 /sys/vm/vm_page.c | |
| parent | d3367c5f5d3ddcc6824d8f41c4cf179f9a5588f8 (diff) | |
| download | FreeBSD-src-0912d72a882e884ecbb8fbf26388308e79e5b302.zip FreeBSD-src-0912d72a882e884ecbb8fbf26388308e79e5b302.tar.gz | |
Update the assertions in vm_page_insert() and vm_page_lookup() to reflect
locking of the kmem_object.
Diffstat (limited to 'sys/vm/vm_page.c')
| -rw-r--r-- | sys/vm/vm_page.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index 71d56c5..9a2d244 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -524,8 +524,6 @@ vm_page_insert(vm_page_t m, vm_object_t object, vm_pindex_t pindex) { vm_page_t root; - GIANT_REQUIRED; - if (m->object != NULL) panic("vm_page_insert: already inserted"); @@ -535,6 +533,7 @@ vm_page_insert(vm_page_t m, vm_object_t object, vm_pindex_t pindex) m->object = object; m->pindex = pindex; + mtx_assert(object == kmem_object ? &object->mtx : &Giant, MA_OWNED); /* * Now link into the object's ordered list of backed pages. */ @@ -645,8 +644,7 @@ vm_page_lookup(vm_object_t object, vm_pindex_t pindex) { vm_page_t m; - GIANT_REQUIRED; - + mtx_assert(object == kmem_object ? &object->mtx : &Giant, MA_OWNED); m = vm_page_splay(pindex, object->root); if ((object->root = m) != NULL && m->pindex != pindex) m = NULL; |
