Author: kib
Date: Wed Nov  9 17:19:50 2016
New Revision: 308470
URL: https://svnweb.freebsd.org/changeset/base/308470

Log:
  MFC r308228:
  Remove remnants of the recursive sleep support.

Modified:
  stable/10/sys/kern/kern_synch.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/kern/kern_synch.c
==============================================================================
--- stable/10/sys/kern/kern_synch.c     Wed Nov  9 17:07:45 2016        
(r308469)
+++ stable/10/sys/kern/kern_synch.c     Wed Nov  9 17:19:50 2016        
(r308470)
@@ -196,13 +196,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])
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"

Reply via email to