From owner-svn-src-all@FreeBSD.ORG  Thu Apr  1 01:23:36 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C22E91065670;
	Thu,  1 Apr 2010 01:23:36 +0000 (UTC)
	(envelope-from lstewart@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B12AA8FC18;
	Thu,  1 Apr 2010 01:23:36 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o311Namc080599;
	Thu, 1 Apr 2010 01:23:36 GMT (envelope-from lstewart@svn.freebsd.org)
Received: (from lstewart@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o311NajH080597;
	Thu, 1 Apr 2010 01:23:36 GMT (envelope-from lstewart@svn.freebsd.org)
Message-Id: <201004010123.o311NajH080597@svn.freebsd.org>
From: Lawrence Stewart <lstewart@FreeBSD.org>
Date: Thu, 1 Apr 2010 01:23:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r206027 - head/sys/kern
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 01 Apr 2010 01:23:36 -0000

Author: lstewart
Date: Thu Apr  1 01:23:36 2010
New Revision: 206027
URL: http://svn.freebsd.org/changeset/base/206027

Log:
  According to SLEEP(9), msleep() is deprecated in favour of mtx_sleep().
  
  Sponsored by:	FreeBSD Foundation
  Reviewed by:	dwmalone, jeff, rpaulo, rwatson (as part of a larger patch)
  Approved by:	kmacy (mentor)
  MFC after:	1 month

Modified:
  head/sys/kern/kern_alq.c

Modified: head/sys/kern/kern_alq.c
==============================================================================
--- head/sys/kern/kern_alq.c	Thu Apr  1 01:16:00 2010	(r206026)
+++ head/sys/kern/kern_alq.c	Thu Apr  1 01:23:36 2010	(r206027)
@@ -191,7 +191,7 @@ ald_daemon(void)
 	for (;;) {
 		while ((alq = LIST_FIRST(&ald_active)) == NULL &&
 		    !ald_shutingdown)
-			msleep(&ald_active, &ald_mtx, PWAIT, "aldslp", 0);
+			mtx_sleep(&ald_active, &ald_mtx, PWAIT, "aldslp", 0);
 
 		/* Don't shutdown until all active ALQs are flushed. */
 		if (ald_shutingdown && alq == NULL) {
@@ -234,12 +234,12 @@ ald_shutdown(void *arg, int howto)
 
 	/*
 	 * Wake ald_daemon so that it exits. It won't be able to do
-	 * anything until we msleep because we hold the ald_mtx.
+	 * anything until we mtx_sleep because we hold the ald_mtx.
 	 */
 	wakeup(&ald_active);
 
 	/* Wait for ald_daemon to exit. */
-	msleep(ald_proc, &ald_mtx, PWAIT, "aldslp", 0);
+	mtx_sleep(ald_proc, &ald_mtx, PWAIT, "aldslp", 0);
 
 	ALD_UNLOCK();
 }