summaryrefslogtreecommitdiff
path: root/sys/uvm/uvm.h
diff options
context:
space:
mode:
authorTed Unangst <tedu@cvs.openbsd.org>2013-05-30 16:39:27 +0000
committerTed Unangst <tedu@cvs.openbsd.org>2013-05-30 16:39:27 +0000
commit5586745861b37857799b4d913397195318e28d15 (patch)
tree3c8ad68572838e0b93533eb46fb79a97e12bbe5f /sys/uvm/uvm.h
parentaf3070bdd7597a04785c2e13047f208c8cdac9af (diff)
UVM_UNLOCK_AND_WAIT no longer unlocks, so rename it to UVM_WAIT.
Diffstat (limited to 'sys/uvm/uvm.h')
-rw-r--r--sys/uvm/uvm.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/uvm/uvm.h b/sys/uvm/uvm.h
index 4f2810ae702..c51d8cabab0 100644
--- a/sys/uvm/uvm.h
+++ b/sys/uvm/uvm.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: uvm.h,v 1.50 2013/05/30 16:29:46 tedu Exp $ */
+/* $OpenBSD: uvm.h,v 1.51 2013/05/30 16:39:26 tedu Exp $ */
/* $NetBSD: uvm.h,v 1.24 2000/11/27 08:40:02 chs Exp $ */
/*
@@ -130,11 +130,10 @@ struct uvm {
extern struct uvm uvm;
/*
- * UVM_UNLOCK_AND_WAIT: atomic unlock+wait... wrapper around the
- * interlocked tsleep() function.
+ * UVM_WAIT: wait... wrapper around the tsleep() function.
*/
-#define UVM_UNLOCK_AND_WAIT(event, slock, intr, msg, timo) \
+#define UVM_WAIT(event, intr, msg, timo) \
do { \
tsleep(event, PVM|PNORELOCK|(intr ? PCATCH : 0), msg, timo); \
} while (0)