From owner-p4-projects@FreeBSD.ORG  Fri Dec  2 21:30:45 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 62E6816A422; Fri,  2 Dec 2005 21:30:45 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 3EA4B16A41F
	for <perforce@freebsd.org>; Fri,  2 Dec 2005 21:30:45 +0000 (GMT)
	(envelope-from alc@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B15FA43D64
	for <perforce@freebsd.org>; Fri,  2 Dec 2005 21:30:44 +0000 (GMT)
	(envelope-from alc@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jB2LUiIP088180
	for <perforce@freebsd.org>; Fri, 2 Dec 2005 21:30:44 GMT
	(envelope-from alc@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jB2LUinX088177
	for perforce@freebsd.org; Fri, 2 Dec 2005 21:30:44 GMT
	(envelope-from alc@freebsd.org)
Date: Fri, 2 Dec 2005 21:30:44 GMT
Message-Id: <200512022130.jB2LUinX088177@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	alc@freebsd.org using -f
From: Alan Cox <alc@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 87658 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Dec 2005 21:30:46 -0000

http://perforce.freebsd.org/chv.cgi?CH=87658

Change 87658 by alc@alc_sp01 on 2005/12/02 21:29:46

	Modify preempt_contig_alloc() so that it fails instead of allocating
	a base page.
	
	Add an assertion to new_reserve() that disallows reservations no
	larger than a base page.

Affected files ...

.. //depot/projects/superpages/src/sys/vm/vm_reserve.c#12 edit

Differences ...

==== //depot/projects/superpages/src/sys/vm/vm_reserve.c#12 (text+ko) ====

@@ -236,6 +236,7 @@
 static reservation_t 
 new_reserve(int level, vm_object_t object)
 {
+	KASSERT(level > -1, ("level > -1"));
 	reservation_t sp = uma_zalloc(sp_zone, M_NOWAIT | M_ZERO);
 	KASSERT(sp,("new_reservation, uma_zalloc failed"));
 	sp->level = level;
@@ -558,7 +559,7 @@
 	}
 
 	/* Downgrade level, retry free, rres... */
-	while (lev >= 0) {
+	while (lev > 0) {
 		lev--;
 
 		if (free_pool) {