summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaudio Jeker <claudio@cvs.openbsd.org>2023-10-06 08:58:14 +0000
committerClaudio Jeker <claudio@cvs.openbsd.org>2023-10-06 08:58:14 +0000
commit863f6d1f986ac14897d019261d7d728f9a87ced1 (patch)
tree7dc037793fb62324b15daa28766308981b69a3b7
parent3119c047723d78f1ccceea256268f24fead9da8c (diff)
In sys___thrsigdivert() switch tsleep_nsec() to use the nowake ident
channel instead of inventing an own one. OK kettenis@ mvs@
-rw-r--r--sys/kern/kern_sig.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c
index 89a703af7b2..4714c829403 100644
--- a/sys/kern/kern_sig.c
+++ b/sys/kern/kern_sig.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_sig.c,v 1.319 2023/09/29 12:47:34 claudio Exp $ */
+/* $OpenBSD: kern_sig.c,v 1.320 2023/10/06 08:58:13 claudio Exp $ */
/* $NetBSD: kern_sig.c,v 1.54 1996/04/22 01:38:32 christos Exp $ */
/*
@@ -1812,7 +1812,6 @@ sys_nosys(struct proc *p, void *v, register_t *retval)
int
sys___thrsigdivert(struct proc *p, void *v, register_t *retval)
{
- static int sigwaitsleep;
struct sys___thrsigdivert_args /* {
syscallarg(sigset_t) sigmask;
syscallarg(siginfo_t *) info;
@@ -1863,8 +1862,7 @@ sys___thrsigdivert(struct proc *p, void *v, register_t *retval)
if (error != 0)
break;
- error = tsleep_nsec(&sigwaitsleep, PPAUSE|PCATCH, "sigwait",
- nsecs);
+ error = tsleep_nsec(&nowake, PPAUSE|PCATCH, "sigwait", nsecs);
}
if (error == 0) {