diff options
-rw-r--r-- | sys/sys/proc.h | 3 | ||||
-rw-r--r-- | sys/uvm/uvm.h | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/sys/sys/proc.h b/sys/sys/proc.h index 29389bb5e6a..ba1ae9e9975 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: proc.h,v 1.102 2007/11/28 20:07:36 oga Exp $ */ +/* $OpenBSD: proc.h,v 1.103 2008/05/05 15:37:41 thib Exp $ */ /* $NetBSD: proc.h,v 1.44 1996/04/22 01:23:21 christos Exp $ */ /*- @@ -456,7 +456,6 @@ void sleep_queue_init(void); int tsleep(void *, int, const char *, int); int msleep(void *, struct mutex *, int, const char*, int); -#define ltsleep(c, p, w, t, l) tsleep(c, p, w, t) #if defined(MULTIPROCESSOR) void proc_trampoline_mp(void); /* XXX */ diff --git a/sys/uvm/uvm.h b/sys/uvm/uvm.h index ec01125d36e..977d45c3b29 100644 --- a/sys/uvm/uvm.h +++ b/sys/uvm/uvm.h @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm.h,v 1.22 2007/11/29 00:26:41 tedu Exp $ */ +/* $OpenBSD: uvm.h,v 1.23 2008/05/05 15:37:41 thib Exp $ */ /* $NetBSD: uvm.h,v 1.24 2000/11/27 08:40:02 chs Exp $ */ /* @@ -157,8 +157,7 @@ extern UVMHIST_DECL(pghist); #define UVM_UNLOCK_AND_WAIT(event, slock, intr, msg, timo) \ do { \ - (void) ltsleep(event, PVM | PNORELOCK | (intr ? PCATCH : 0), \ - msg, timo, slock); \ + tsleep(event, PVM|PNORELOCK|(intr ? PCATCH : 0), msg, timo); \ } while (0) /* |