From owner-svn-src-all@FreeBSD.ORG  Sun Nov 20 08:36:18 2011
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 9C3931065670;
	Sun, 20 Nov 2011 08:36:18 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8C0C78FC0A;
	Sun, 20 Nov 2011 08:36:18 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pAK8aIUK082866;
	Sun, 20 Nov 2011 08:36:18 GMT
	(envelope-from hselasky@svn.freebsd.org)
Received: (from hselasky@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pAK8aIEq082864;
	Sun, 20 Nov 2011 08:36:18 GMT
	(envelope-from hselasky@svn.freebsd.org)
Message-Id: <201111200836.pAK8aIEq082864@svn.freebsd.org>
From: Hans Petter Selasky <hselasky@FreeBSD.org>
Date: Sun, 20 Nov 2011 08:36:18 +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: r227749 - 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: Sun, 20 Nov 2011 08:36:18 -0000

Author: hselasky
Date: Sun Nov 20 08:36:18 2011
New Revision: 227749
URL: http://svn.freebsd.org/changeset/base/227749

Log:
  Given that the typical usage of pause() is pause("zzz", hz / N), where N can
  be greater than hz in some cases, simply ignore a timeout value of zero.
  
  Suggested by:	Bruce Evans
  MFC after:	1 week

Modified:
  head/sys/kern/kern_synch.c

Modified: head/sys/kern/kern_synch.c
==============================================================================
--- head/sys/kern/kern_synch.c	Sun Nov 20 08:29:23 2011	(r227748)
+++ head/sys/kern/kern_synch.c	Sun Nov 20 08:36:18 2011	(r227749)
@@ -333,7 +333,7 @@ msleep_spin(void *ident, struct mtx *mtx
 int
 pause(const char *wmesg, int timo)
 {
-	KASSERT(timo > 0, ("pause: timo must be > 0"));
+	KASSERT(timo >= 0, ("pause: timo must be >= 0"));
 
 	/* silently convert invalid timeouts */
 	if (timo < 1)