diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/kern/kern_sig.c | 4 | ||||
| -rw-r--r-- | sys/kern/kern_synch.c | 4 | ||||
| -rw-r--r-- | sys/kern/sys_futex.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index 5738cd71af1..30f570fafc8 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_sig.c,v 1.231 2019/06/21 09:39:48 visa Exp $ */ +/* $OpenBSD: kern_sig.c,v 1.232 2019/07/10 15:52:17 mpi Exp $ */ /* $NetBSD: kern_sig.c,v 1.54 1996/04/22 01:38:32 christos Exp $ */ /* @@ -2049,7 +2049,7 @@ single_thread_wait(struct process *pr) { /* wait until they're all suspended */ while (pr->ps_singlecount > 0) - tsleep(&pr->ps_singlecount, PUSER, "suspend", 0); + tsleep(&pr->ps_singlecount, PWAIT, "suspend", 0); } void diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c index 98e85a5bd68..04ec550abb9 100644 --- a/sys/kern/kern_synch.c +++ b/sys/kern/kern_synch.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_synch.c,v 1.150 2019/07/03 22:39:33 cheloha Exp $ */ +/* $OpenBSD: kern_synch.c,v 1.151 2019/07/10 15:52:17 mpi Exp $ */ /* $NetBSD: kern_synch.c,v 1.37 1996/04/22 01:38:37 christos Exp $ */ /* @@ -644,7 +644,7 @@ thrsleep(struct proc *p, struct sys___thrsleep_args *v) void *sleepaddr = &p->p_thrslpid; if (ident == -1) sleepaddr = &globalsleepaddr; - error = tsleep(sleepaddr, PUSER | PCATCH, "thrsleep", + error = tsleep(sleepaddr, PWAIT|PCATCH, "thrsleep", (int)to_ticks); } diff --git a/sys/kern/sys_futex.c b/sys/kern/sys_futex.c index 1bf8fff081e..0fbb31ad9ef 100644 --- a/sys/kern/sys_futex.c +++ b/sys/kern/sys_futex.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sys_futex.c,v 1.12 2019/02/06 15:11:20 mpi Exp $ */ +/* $OpenBSD: sys_futex.c,v 1.13 2019/07/10 15:52:17 mpi Exp $ */ /* * Copyright (c) 2016-2017 Martin Pieuchot @@ -254,7 +254,7 @@ futex_wait(uint32_t *uaddr, uint32_t val, const struct timespec *timeout, TAILQ_INSERT_TAIL(&f->ft_threads, p, p_fut_link); p->p_futex = f; - error = rwsleep(p, &ftlock, PUSER|PCATCH, "fsleep", (int)to_ticks); + error = rwsleep(p, &ftlock, PWAIT|PCATCH, "fsleep", (int)to_ticks); if (error == ERESTART) error = ECANCELED; else if (error == EWOULDBLOCK) { |