summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys/kern/vfs_bio.c2
-rw-r--r--sys/vm/vm_page.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c
index 1f1914c..b8a156c 100644
--- a/sys/kern/vfs_bio.c
+++ b/sys/kern/vfs_bio.c
@@ -3579,7 +3579,9 @@ vmapbuf(struct buf *bp)
if (pa == 0)
panic("vmapbuf: page not present");
m = PHYS_TO_VM_PAGE(pa);
+ vm_page_lock_queues();
vm_page_hold(m);
+ vm_page_unlock_queues();
bp->b_pages[pidx] = m;
}
if (pidx > btoc(MAXPHYS))
diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c
index bbdc77b..74ba2e7 100644
--- a/sys/vm/vm_page.c
+++ b/sys/vm/vm_page.c
@@ -358,7 +358,8 @@ vm_page_io_finish(vm_page_t m)
void
vm_page_hold(vm_page_t mem)
{
- GIANT_REQUIRED;
+
+ mtx_assert(&vm_page_queue_mtx, MA_OWNED);
mem->hold_count++;
}
OpenPOWER on IntegriCloud