svn commit: r192368 - user/kmacy/releng_7_2_fcs/sys/kern

Kip Macy kmacy at FreeBSD.org
Tue May 19 03:45:37 UTC 2009


Author: kmacy
Date: Tue May 19 03:45:36 2009
New Revision: 192368
URL: http://svn.freebsd.org/changeset/base/192368

Log:
  fix more sleepq callers

Modified:
  user/kmacy/releng_7_2_fcs/sys/kern/kern_condvar.c
  user/kmacy/releng_7_2_fcs/sys/kern/kern_synch.c
  user/kmacy/releng_7_2_fcs/sys/kern/sys_generic.c

Modified: user/kmacy/releng_7_2_fcs/sys/kern/kern_condvar.c
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/kern/kern_condvar.c	Tue May 19 03:21:51 2009	(r192367)
+++ user/kmacy/releng_7_2_fcs/sys/kern/kern_condvar.c	Tue May 19 03:45:36 2009	(r192368)
@@ -417,7 +417,7 @@ cv_signal(struct cv *cvp)
 	sleepq_lock(cvp);
 	if (cvp->cv_waiters > 0) {
 		cvp->cv_waiters--;
-		wakeup_swapper = sleepq_signal(cvp, SLEEPQ_CONDVAR, -1, 0);
+		wakeup_swapper = sleepq_signal(cvp, SLEEPQ_CONDVAR, 0, 0);
 	}
 	sleepq_release(cvp);
 	if (wakeup_swapper)
@@ -433,12 +433,6 @@ cv_broadcastpri(struct cv *cvp, int pri)
 {
 	int wakeup_swapper;
 
-	/*
-	 * XXX sleepq_broadcast pri argument changed from -1 meaning
-	 * no pri to 0 meaning no pri.
-	 */
-	if (pri == -1)
-		pri = 0;
 	wakeup_swapper = 0;
 	sleepq_lock(cvp);
 	if (cvp->cv_waiters > 0) {

Modified: user/kmacy/releng_7_2_fcs/sys/kern/kern_synch.c
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/kern/kern_synch.c	Tue May 19 03:21:51 2009	(r192367)
+++ user/kmacy/releng_7_2_fcs/sys/kern/kern_synch.c	Tue May 19 03:45:36 2009	(r192368)
@@ -350,7 +350,7 @@ wakeup_one(void *ident)
 	int wakeup_swapper;
 
 	sleepq_lock(ident);
-	wakeup_swapper = sleepq_signal(ident, SLEEPQ_SLEEP, -1, 0);
+	wakeup_swapper = sleepq_signal(ident, SLEEPQ_SLEEP, 0, 0);
 	sleepq_release(ident);
 	if (wakeup_swapper)
 		kick_proc0();

Modified: user/kmacy/releng_7_2_fcs/sys/kern/sys_generic.c
==============================================================================
--- user/kmacy/releng_7_2_fcs/sys/kern/sys_generic.c	Tue May 19 03:21:51 2009	(r192367)
+++ user/kmacy/releng_7_2_fcs/sys/kern/sys_generic.c	Tue May 19 03:45:36 2009	(r192368)
@@ -1306,7 +1306,7 @@ void
 selwakeup(sip)
 	struct selinfo *sip;
 {
-	doselwakeup(sip, -1);
+	doselwakeup(sip, 0);
 }
 
 /* Wake up a selecting thread, and set its priority. */


More information about the svn-src-user mailing list