From owner-svn-src-all@FreeBSD.ORG  Mon Nov 22 21:22:08 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 C4BF5106564A;
	Mon, 22 Nov 2010 21:22:08 +0000 (UTC)
	(envelope-from mlaier@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B2E598FC0A;
	Mon, 22 Nov 2010 21:22:08 +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 oAMLM8x7006394;
	Mon, 22 Nov 2010 21:22:08 GMT (envelope-from mlaier@svn.freebsd.org)
Received: (from mlaier@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oAMLM8HS006392;
	Mon, 22 Nov 2010 21:22:08 GMT (envelope-from mlaier@svn.freebsd.org)
Message-Id: <201011222122.oAMLM8HS006392@svn.freebsd.org>
From: Max Laier <mlaier@FreeBSD.org>
Date: Mon, 22 Nov 2010 21:22:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r215715 - stable/7/sys/vm
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: Mon, 22 Nov 2010 21:22:08 -0000

Author: mlaier
Date: Mon Nov 22 21:22:08 2010
New Revision: 215715
URL: http://svn.freebsd.org/changeset/base/215715

Log:
  MFH r215508:
    Off by one page in vm_reserv_reclaim_contig(): reclaim reservations with
    only a single free page as well.
  
    Reviewed by:	alc

Modified:
  stable/7/sys/vm/vm_reserv.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/vm/vm_reserv.c
==============================================================================
--- stable/7/sys/vm/vm_reserv.c	Mon Nov 22 21:20:11 2010	(r215714)
+++ stable/7/sys/vm/vm_reserv.c	Mon Nov 22 21:22:08 2010	(r215715)
@@ -659,7 +659,8 @@ vm_reserv_reclaim_contig(vm_paddr_t size
 					    ((pa ^ (pa + size - 1)) &
 					    ~(boundary - 1)) != 0)
 						pa_length = 0;
-				} else if (pa_length >= size) {
+				}
+				if (pa_length >= size) {
 					vm_reserv_reclaim(rv);
 					return (TRUE);
 				}