diff options
| author | Jeff Roberson <jeff@FreeBSD.org> | 2008-03-12 10:12:01 +0000 |
|---|---|---|
| committer | Jeff Roberson <jeff@FreeBSD.org> | 2008-03-12 10:12:01 +0000 |
| commit | 6617724c5fb1fc40eecc58f541ffbdcd005ba5c8 (patch) | |
| tree | c3fbc6ec97828161d5fc648204b80efb7998da35 /sys/kern/subr_sleepqueue.c | |
| parent | 7f77f84497e3308499a60bd662a04ea588a7c322 (diff) | |
Notes
Diffstat (limited to 'sys/kern/subr_sleepqueue.c')
| -rw-r--r-- | sys/kern/subr_sleepqueue.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/sys/kern/subr_sleepqueue.c b/sys/kern/subr_sleepqueue.c index dca91ff5fea1..175cc6030bf9 100644 --- a/sys/kern/subr_sleepqueue.c +++ b/sys/kern/subr_sleepqueue.c @@ -410,13 +410,8 @@ sleepq_catch_signals(void *wchan, int pri) PROC_UNLOCK(p); thread_lock(td); if (ret == 0) { - if (!(td->td_flags & TDF_INTERRUPT)) { - sleepq_switch(wchan, pri); - return (0); - } - /* KSE threads tried unblocking us. */ - ret = td->td_intrval; - MPASS(ret == EINTR || ret == ERESTART || ret == EWOULDBLOCK); + sleepq_switch(wchan, pri); + return (0); } /* * There were pending signals and this thread is still @@ -540,9 +535,6 @@ sleepq_check_signals(void) return (td->td_intrval); } - if (td->td_flags & TDF_INTERRUPT) - return (td->td_intrval); - return (0); } |
