From owner-svn-src-user@FreeBSD.ORG Tue May 19 03:45:37 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6C18F106566C; Tue, 19 May 2009 03:45:37 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5A6728FC16; Tue, 19 May 2009 03:45:37 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4J3jbKJ084068; Tue, 19 May 2009 03:45:37 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4J3jbwM084065; Tue, 19 May 2009 03:45:37 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <200905190345.n4J3jbwM084065@svn.freebsd.org> From: Kip Macy Date: Tue, 19 May 2009 03:45:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r192368 - user/kmacy/releng_7_2_fcs/sys/kern X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 May 2009 03:45:37 -0000 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. */