svn commit: r308228 - head/sys/kern

[Konstantin Belousov]

Author: kib
Date: Wed Nov  2 20:57:20 2016
New Revision: 308228
URL: https://svnweb.freebsd.org/changeset/base/308228

Log:
  Remove remnants of the recursive sleep support.  Instead assert that
  we never try to sleep while the thread is on a sleepqueue.
  
  Reviewed by:	jhb
  Tested by:	pho
  Sponsored by:	The FreeBSD Foundation
  MFC after:	1 week
  Differential revision:	https://reviews.freebsd.org/D8422

Modified:
  head/sys/kern/kern_synch.c

Modified: head/sys/kern/kern_synch.c
==============================================================================
--- head/sys/kern/kern_synch.c	Wed Nov  2 19:18:24 2016	(r308227)
+++ head/sys/kern/kern_synch.c	Wed Nov  2 20:57:20 2016	(r308228)
@@ -170,13 +170,7 @@ _sleep(void *ident, struct lock_object *
 	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])