Put the scheduler, vmdaemon, and pagedaemon kthreads back under Giant for

now.  The proc locking isn't actually safe yet and won't be until the proc
locking is finished.

1 files changed, 0 insertions, 3 deletions

diff --git a/sys/vm/vm_glue.c b/sys/vm/vm_glue.c
index 3a4ebcacdaf1..ba14789b2717 100644
--- a/sys/vm/vm_glue.c
+++ b/sys/vm/vm_glue.c
@@ -374,7 +374,6 @@ scheduler(dummy)
 	int ppri;
 
 	mtx_assert(&Giant, MA_OWNED | MA_NOTRECURSED);
-	mtx_unlock(&Giant);
 
 loop:
 	mtx_lock(&vm_mtx);
@@ -426,11 +425,9 @@ loop:
 	/*
 	 * We would like to bring someone in. (only if there is space).
 	 */
-	mtx_lock(&Giant);
 	PROC_LOCK(p);
 	faultin(p);
 	PROC_UNLOCK(p);
-	mtx_unlock(&Giant);
 	mtx_lock_spin(&sched_lock);
 	p->p_swtime = 0;
 	mtx_unlock_spin(&sched_lock);