summaryrefslogtreecommitdiffstats
path: root/sys/kern
diff options
context:
space:
mode:
authorkib <kib@FreeBSD.org>2016-11-09 17:19:50 +0000
committerkib <kib@FreeBSD.org>2016-11-09 17:19:50 +0000
commitfb67bc5f754862d6038605951f50638907447c69 (patch)
tree8ee715a3d6a233142974d7ca43ca7a93acbc5382 /sys/kern
parentf7212ea56cac75ffb30317c98e0182e071e2a29b (diff)
downloadFreeBSD-src-fb67bc5f754862d6038605951f50638907447c69.zip
FreeBSD-src-fb67bc5f754862d6038605951f50638907447c69.tar.gz
MFC r308228:
Remove remnants of the recursive sleep support.
Diffstat (limited to 'sys/kern')
-rw-r--r--sys/kern/kern_synch.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c
index fbad175..13ae3bc 100644
--- a/sys/kern/kern_synch.c
+++ b/sys/kern/kern_synch.c
@@ -196,13 +196,7 @@ _sleep(void *ident, struct lock_object *lock, int priority,
catch = priority & PCATCH;
pri = priority & PRIMASK;
- /*
- * If we are already on a sleep queue, then remove us from that
- * sleep queue first. We have to do this to handle recursive
- * sleeps.
- */
- if (TD_ON_SLEEPQ(td))
- sleepq_remove(td, td->td_wchan);
+ KASSERT(!TD_ON_SLEEPQ(td), ("recursive sleep"));
if ((uint8_t *)ident >= &pause_wchan[0] &&
(uint8_t *)ident <= &pause_wchan[MAXCPU - 1])
OpenPOWER on IntegriCloud