From 21832b1ec0b31b7e4d738c68a151335d9158436a Mon Sep 17 00:00:00 2001
From: John Baldwin <jhb@FreeBSD.org>
Date: Fri, 21 Sep 2001 19:21:18 +0000
Subject: [PATCH] GC some #if 0'd code.

---
 sys/kern/kern_synch.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c
index 8de12999d8d8..45a61901cc4c 100644
--- a/sys/kern/kern_synch.c
+++ b/sys/kern/kern_synch.c
@@ -899,21 +899,15 @@ int
 yield(struct thread *td, struct yield_args *uap)
 {
 	struct ksegrp *kg = td->td_ksegrp;
-	td->td_retval[0] = 0;
 
-	mtx_lock_spin(&sched_lock);
 	mtx_assert(&Giant, MA_NOTOWNED);
-#if 0
-	DROP_GIANT_NOSWITCH();
-#endif
+	mtx_lock_spin(&sched_lock);
 	kg->kg_pri.pri_level = PRI_MAX_TIMESHARE;
 	setrunqueue(td);
 	kg->kg_proc->p_stats->p_ru.ru_nvcsw++;
 	mi_switch();
 	mtx_unlock_spin(&sched_lock);
-#if 0
-	PICKUP_GIANT();
-#endif
+	td->td_retval[0] = 0;
 
 	return (0);
 }