summaryrefslogtreecommitdiffstats
path: root/sys/vm/vm_page.c
diff options
context:
space:
mode:
authoralc <alc@FreeBSD.org>2003-09-28 04:50:48 +0000
committeralc <alc@FreeBSD.org>2003-09-28 04:50:48 +0000
commit8b797c473e7662be341366e487d9bb4adbadaf05 (patch)
tree64b9af56cb9978fa45cac2d9330ebf64cf24293b /sys/vm/vm_page.c
parent704509bd2f429c96ae3d27aee6715bf5a3b24c8a (diff)
downloadFreeBSD-src-8b797c473e7662be341366e487d9bb4adbadaf05.zip
FreeBSD-src-8b797c473e7662be341366e487d9bb4adbadaf05.tar.gz
In vm_page_remove(), assert that the vm object is locked, unless an Alpha.
(The Alpha still requires updates to its pmap.)
Diffstat (limited to 'sys/vm/vm_page.c')
-rw-r--r--sys/vm/vm_page.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c
index e517561..dbd0263 100644
--- a/sys/vm/vm_page.c
+++ b/sys/vm/vm_page.c
@@ -604,8 +604,9 @@ vm_page_remove(vm_page_t m)
mtx_assert(&vm_page_queue_mtx, MA_OWNED);
if (m->object == NULL)
return;
- if (!VM_OBJECT_LOCKED(m->object))
- GIANT_REQUIRED;
+#ifndef __alpha__
+ VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED);
+#endif
if ((m->flags & PG_BUSY) == 0) {
panic("vm_page_remove: page not busy");
}
OpenPOWER on IntegriCloud