From owner-svn-src-head@FreeBSD.ORG  Sun Aug  7 00:11:40 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 37D6E1065670;
	Sun,  7 Aug 2011 00:11:40 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 28F368FC0C;
	Sun,  7 Aug 2011 00:11:40 +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 p770BeM2072892;
	Sun, 7 Aug 2011 00:11:40 GMT (envelope-from alc@svn.freebsd.org)
Received: (from alc@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p770BeaC072890;
	Sun, 7 Aug 2011 00:11:40 GMT (envelope-from alc@svn.freebsd.org)
Message-Id: <201108070011.p770BeaC072890@svn.freebsd.org>
From: Alan Cox <alc@FreeBSD.org>
Date: Sun, 7 Aug 2011 00:11:40 +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: r224689 - head/sys/vm
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 07 Aug 2011 00:11:40 -0000

Author: alc
Date: Sun Aug  7 00:11:39 2011
New Revision: 224689
URL: http://svn.freebsd.org/changeset/base/224689

Log:
  Fix an error in kmem_alloc_attr().  Unless "tries" is updated,
  kmem_alloc_attr() could get stuck in a loop.
  
  Approved by:	re (kib)
  MFC after:	3 days

Modified:
  head/sys/vm/vm_contig.c

Modified: head/sys/vm/vm_contig.c
==============================================================================
--- head/sys/vm/vm_contig.c	Sat Aug  6 19:20:17 2011	(r224688)
+++ head/sys/vm/vm_contig.c	Sun Aug  7 00:11:39 2011	(r224689)
@@ -265,6 +265,7 @@ retry:
 				vm_contig_grow_cache(tries, low, high);
 				vm_map_lock(map);
 				VM_OBJECT_LOCK(object);
+				tries++;
 				goto retry;
 			}
 			while (i != 0) {