From owner-svn-src-stable-8@FreeBSD.ORG  Sun Dec  4 02:06:12 2011
Return-Path: <owner-svn-src-stable-8@FreeBSD.ORG>
Delivered-To: svn-src-stable-8@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 81122106566B;
	Sun,  4 Dec 2011 02:06:12 +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 705248FC12;
	Sun,  4 Dec 2011 02:06:12 +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 pB426CVx065758;
	Sun, 4 Dec 2011 02:06:12 GMT (envelope-from alc@svn.freebsd.org)
Received: (from alc@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pB426C3m065756;
	Sun, 4 Dec 2011 02:06:12 GMT (envelope-from alc@svn.freebsd.org)
Message-Id: <201112040206.pB426C3m065756@svn.freebsd.org>
From: Alan Cox <alc@FreeBSD.org>
Date: Sun, 4 Dec 2011 02:06:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r228251 - stable/8/sys/vm
X-BeenThere: svn-src-stable-8@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 8-stable src tree
	<svn-src-stable-8.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-8>
List-Post: <mailto:svn-src-stable-8@freebsd.org>
List-Help: <mailto:svn-src-stable-8-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 04 Dec 2011 02:06:12 -0000

Author: alc
Date: Sun Dec  4 02:06:12 2011
New Revision: 228251
URL: http://svn.freebsd.org/changeset/base/228251

Log:
  MFC r224689
    Fix an error in kmem_alloc_attr().  Unless "tries" is updated,
    kmem_alloc_attr() could get stuck in a loop.

Modified:
  stable/8/sys/vm/vm_contig.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/vm/vm_contig.c
==============================================================================
--- stable/8/sys/vm/vm_contig.c	Sun Dec  4 01:22:22 2011	(r228250)
+++ stable/8/sys/vm/vm_contig.c	Sun Dec  4 02:06:12 2011	(r228251)
@@ -253,6 +253,7 @@ retry:
 				vm_contig_grow_cache(tries, low, high);
 				vm_map_lock(map);
 				VM_OBJECT_LOCK(object);
+				tries++;
 				goto retry;
 			}
 			while (i != 0) {