From owner-svn-src-stable-9@FreeBSD.ORG  Fri Jul  5 18:51:21 2013
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id BA0B9D85;
 Fri,  5 Jul 2013 18:51:21 +0000 (UTC)
 (envelope-from andre@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id AABE71CBB;
 Fri,  5 Jul 2013 18:51:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r65IpLFk038733;
 Fri, 5 Jul 2013 18:51:21 GMT (envelope-from andre@svn.freebsd.org)
Received: (from andre@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r65IpLcn038732;
 Fri, 5 Jul 2013 18:51:21 GMT (envelope-from andre@svn.freebsd.org)
Message-Id: <201307051851.r65IpLcn038732@svn.freebsd.org>
From: Andre Oppermann <andre@FreeBSD.org>
Date: Fri, 5 Jul 2013 18:51:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r252823 - stable/9/sys/sys
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
 <svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Jul 2013 18:51:21 -0000

Author: andre
Date: Fri Jul  5 18:51:21 2013
New Revision: 252823
URL: http://svnweb.freebsd.org/changeset/base/252823

Log:
  MFC r243628:
  
    Update comment to prefer M_NOWAIT over M_DONTWAIT and
    M_WAITOK over M_WAIT.

Modified:
  stable/9/sys/sys/mbuf.h
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/sys/   (props changed)

Modified: stable/9/sys/sys/mbuf.h
==============================================================================
--- stable/9/sys/sys/mbuf.h	Fri Jul  5 18:50:17 2013	(r252822)
+++ stable/9/sys/sys/mbuf.h	Fri Jul  5 18:51:21 2013	(r252823)
@@ -350,8 +350,8 @@ struct mbstat {
  * Flags specifying how an allocation should be made.
  *
  * The flag to use is as follows:
- * - M_DONTWAIT or M_NOWAIT from an interrupt handler to not block allocation.
- * - M_WAIT or M_WAITOK from wherever it is safe to block.
+ * - M_NOWAIT (M_DONTWAIT) from an interrupt handler to not block allocation.
+ * - M_WAITOK (M_WAIT) from wherever it is safe to block.
  *
  * M_DONTWAIT/M_NOWAIT means that we will not block the thread explicitly and
  * if we cannot allocate immediately we may return NULL, whereas