From owner-svn-src-head@freebsd.org Tue Mar 1 22:51:46 2016 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5D3FAAC0A46; Tue, 1 Mar 2016 22:51:46 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 16E421BC6; Tue, 1 Mar 2016 22:51:46 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u21Mpjg9055250; Tue, 1 Mar 2016 22:51:45 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u21MpjCt055249; Tue, 1 Mar 2016 22:51:45 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201603012251.u21MpjCt055249@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Tue, 1 Mar 2016 22:51:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r296283 - head/sys/kern X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Mar 2016 22:51:46 -0000 Author: jhb Date: Tue Mar 1 22:51:44 2016 New Revision: 296283 URL: https://svnweb.freebsd.org/changeset/base/296283 Log: Use SCHEDULER_STOPPED() in cv_*wait*() instead of checking panicstr. Reviewed by: kib MFC after: 1 month Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D5516 Modified: head/sys/kern/kern_condvar.c Modified: head/sys/kern/kern_condvar.c ============================================================================== --- head/sys/kern/kern_condvar.c Tue Mar 1 22:25:54 2016 (r296282) +++ head/sys/kern/kern_condvar.c Tue Mar 1 22:51:44 2016 (r296283) @@ -122,7 +122,7 @@ _cv_wait(struct cv *cvp, struct lock_obj "Waiting on \"%s\"", cvp->cv_description); class = LOCK_CLASS(lock); - if (cold || panicstr) { + if (cold || SCHEDULER_STOPPED()) { /* * During autoconfiguration, just give interrupts * a chance, then just return. Don't run any other @@ -183,7 +183,7 @@ _cv_wait_unlock(struct cv *cvp, struct l ("cv_wait_unlock cannot be used with Giant")); class = LOCK_CLASS(lock); - if (cold || panicstr) { + if (cold || SCHEDULER_STOPPED()) { /* * During autoconfiguration, just give interrupts * a chance, then just return. Don't run any other @@ -240,7 +240,7 @@ _cv_wait_sig(struct cv *cvp, struct lock "Waiting on \"%s\"", cvp->cv_description); class = LOCK_CLASS(lock); - if (cold || panicstr) { + if (cold || SCHEDULER_STOPPED()) { /* * After a panic, or during autoconfiguration, just give * interrupts a chance, then just return; don't run any other @@ -307,7 +307,7 @@ _cv_timedwait_sbt(struct cv *cvp, struct "Waiting on \"%s\"", cvp->cv_description); class = LOCK_CLASS(lock); - if (cold || panicstr) { + if (cold || SCHEDULER_STOPPED()) { /* * After a panic, or during autoconfiguration, just give * interrupts a chance, then just return; don't run any other @@ -376,7 +376,7 @@ _cv_timedwait_sig_sbt(struct cv *cvp, st "Waiting on \"%s\"", cvp->cv_description); class = LOCK_CLASS(lock); - if (cold || panicstr) { + if (cold || SCHEDULER_STOPPED()) { /* * After a panic, or during autoconfiguration, just give * interrupts a chance, then just return; don't run any other