summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorMartin Pieuchot <mpi@cvs.openbsd.org>2022-07-11 11:29:12 +0000
committerMartin Pieuchot <mpi@cvs.openbsd.org>2022-07-11 11:29:12 +0000
commit7403a93e9c8984cc093f08e047de83089bc50e54 (patch)
treeddbc4f9b64280be08c8caa312b1ad5eb4b11917b /sys
parent6426439b0675e639e210fc8ad065405705191fd2 (diff)
Remove asynchronous read support in uvm_swap_get().
Reading pages from swap is always done synchronously. The fault handler needs to sleep and PGO_SYNCIO is already asserted a couple of lines above. ok beck@, kettenis@ as part of a larger diff.
Diffstat (limited to 'sys')
-rw-r--r--sys/uvm/uvm_swap.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/uvm/uvm_swap.c b/sys/uvm/uvm_swap.c
index 6516adbed5f..62237d86468 100644
--- a/sys/uvm/uvm_swap.c
+++ b/sys/uvm/uvm_swap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uvm_swap.c,v 1.159 2022/06/30 13:54:37 mpi Exp $ */
+/* $OpenBSD: uvm_swap.c,v 1.160 2022/07/11 11:29:11 mpi Exp $ */
/* $NetBSD: uvm_swap.c,v 1.40 2000/11/17 11:39:39 mrg Exp $ */
/*
@@ -1603,8 +1603,7 @@ uvm_swap_get(struct vm_page *page, int swslot, int flags)
}
KERNEL_LOCK();
- result = uvm_swap_io(&page, swslot, 1, B_READ |
- ((flags & PGO_SYNCIO) ? 0 : B_ASYNC));
+ result = uvm_swap_io(&page, swslot, 1, B_READ);
KERNEL_UNLOCK();
if (result == VM_PAGER_OK || result == VM_PAGER_PEND) {