Backout mwakeup, etc.

1 files changed, 0 insertions, 39 deletions

diff --git a/sys/kern/kern_condvar.c b/sys/kern/kern_condvar.c
index cf7dbff..07ed3b7 100644
--- a/sys/kern/kern_condvar.c
+++ b/sys/kern/kern_condvar.c
@@ -492,26 +492,6 @@ cv_signal(struct cv *cvp)
 }
 
 /*
- * Signal a condition variable, dropping the passed in mutex before waking
- * a waiting process.
- */
-void
-cv_signal_drop(struct cv *cvp, struct mtx *mp)
-{
-
-	KASSERT(cvp != NULL, ("%s: cvp NULL", __FUNCTION__));
-	KASSERT(mp != NULL, ("%s: mp NULL", __FUNCTION__));
-	mtx_assert(mp, MA_OWNED | MA_NOTRECURSED);
-	mtx_lock_spin(&sched_lock);
-	mtx_unlock_flags(mp, MTX_NOSWITCH);
-	if (!TAILQ_EMPTY(&cvp->cv_waitq)) {
-		CV_SIGNAL_VALIDATE(cvp);
-		cv_wakeup(cvp);
-	}
-	mtx_unlock_spin(&sched_lock);
-}
-
-/*
  * Broadcast a signal to a condition variable.  Wakes up all waiting processes.
  * Should be called with the same mutex as was passed to cv_wait held.
  */
@@ -528,25 +508,6 @@ cv_broadcast(struct cv *cvp)
 }
 
 /*
- * Broadcast a signal to a condition variable, dropping the passed in mutex
- * before waking any waiting processes.
- */
-void
-cv_broadcast_drop(struct cv *cvp, struct mtx *mp)
-{
-
-	KASSERT(cvp != NULL, ("%s: cvp NULL", __FUNCTION__));
-	KASSERT(mp != NULL, ("%s: mp NULL", __FUNCTION__));
-	mtx_assert(mp, MA_OWNED | MA_NOTRECURSED);
-	mtx_lock_spin(&sched_lock);
-	mtx_unlock_flags(mp, MTX_NOSWITCH);
-	CV_SIGNAL_VALIDATE(cvp);
-	while (!TAILQ_EMPTY(&cvp->cv_waitq))
-		cv_wakeup(cvp);
-	mtx_unlock_spin(&sched_lock);
-}
-
-/*
  * Remove a process from the wait queue of its condition variable.  This may be
  * called externally.
  */