From 2e9d00a15d95f6dff25b9817b0a0dd51139686ca Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Tue, 22 Apr 2003 14:26:02 +0000 Subject: [PATCH] Revision 1.246 should have also included - Weaken the assertion in vm_page_insert() to require Giant only if the vm_object isn't locked. Reported by: "Ilmar S. Habibulin" --- sys/vm/vm_page.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index 8ce52ab836a..d5b8a5c3fc8 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -532,6 +532,8 @@ vm_page_insert(vm_page_t m, vm_object_t object, vm_pindex_t pindex) { vm_page_t root; + if (!VM_OBJECT_LOCKED(object)) + GIANT_REQUIRED; if (m->object != NULL) panic("vm_page_insert: already inserted"); @@ -541,7 +543,6 @@ 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. */