From 0912d72a882e884ecbb8fbf26388308e79e5b302 Mon Sep 17 00:00:00 2001 From: alc Date: Wed, 1 Jan 2003 19:45:36 +0000 Subject: Update the assertions in vm_page_insert() and vm_page_lookup() to reflect locking of the kmem_object. --- sys/vm/vm_page.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'sys/vm/vm_page.c') 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; -- cgit v1.1