diff options
| -rw-r--r-- | sys/kern/kern_condvar.c | 2 | ||||
| -rw-r--r-- | sys/kern/kern_synch.c | 2 | ||||
| -rw-r--r-- | sys/kern/subr_sleepqueue.c | 7 | ||||
| -rw-r--r-- | sys/sys/sleepqueue.h | 2 |
4 files changed, 5 insertions, 8 deletions
diff --git a/sys/kern/kern_condvar.c b/sys/kern/kern_condvar.c index 2b7bd970a573..64a82240b5aa 100644 --- a/sys/kern/kern_condvar.c +++ b/sys/kern/kern_condvar.c @@ -250,7 +250,7 @@ cv_timedwait(struct cv *cvp, struct mtx *mp, int timo) sleepq_add(sq, cvp, mp, cvp->cv_description, SLEEPQ_CONDVAR); sleepq_set_timeout(cvp, timo); - rval = sleepq_timedwait(cvp, 0); + rval = sleepq_timedwait(cvp); #ifdef KTRACE if (KTRPOINT(td, KTR_CSW)) diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c index 71d78a0971ee..54f7cdf4f57e 100644 --- a/sys/kern/kern_synch.c +++ b/sys/kern/kern_synch.c @@ -236,7 +236,7 @@ msleep(ident, mtx, priority, wmesg, timo) if (timo && catch) rval = sleepq_timedwait_sig(ident, sig != 0); else if (timo) - rval = sleepq_timedwait(ident, sig != 0); + rval = sleepq_timedwait(ident); else if (catch) rval = sleepq_wait_sig(ident); else { diff --git a/sys/kern/subr_sleepqueue.c b/sys/kern/subr_sleepqueue.c index e3f1996d8511..a312ddfb28ad 100644 --- a/sys/kern/subr_sleepqueue.c +++ b/sys/kern/subr_sleepqueue.c @@ -499,17 +499,14 @@ sleepq_wait_sig(void *wchan) * or it times out while waiting. */ int -sleepq_timedwait(void *wchan, int signal_caught) +sleepq_timedwait(void *wchan) { int rval; sleepq_switch(wchan); rval = sleepq_check_timeout(); mtx_unlock_spin(&sched_lock); - if (signal_caught) - return (0); - else - return (rval); + return (rval); } /* diff --git a/sys/sys/sleepqueue.h b/sys/sys/sleepqueue.h index de5cfb80e7e5..27a7101d2e15 100644 --- a/sys/sys/sleepqueue.h +++ b/sys/sys/sleepqueue.h @@ -98,7 +98,7 @@ void sleepq_release(void *); void sleepq_remove(struct thread *, void *); void sleepq_signal(void *, int, int); void sleepq_set_timeout(void *wchan, int timo); -int sleepq_timedwait(void *wchan, int signal_caught); +int sleepq_timedwait(void *wchan); int sleepq_timedwait_sig(void *wchan, int signal_caught); void sleepq_wait(void *); int sleepq_wait_sig(void *wchan); |