From owner-p4-projects@FreeBSD.ORG  Wed Feb  1 06:52:15 2006
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 8B0A516A422; Wed,  1 Feb 2006 06:52:14 +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 466E116A425
	for <perforce@freebsd.org>; Wed,  1 Feb 2006 06:52:14 +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 0D94B43D49
	for <perforce@freebsd.org>; Wed,  1 Feb 2006 06:52:14 +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 k116qDal026894
	for <perforce@freebsd.org>; Wed, 1 Feb 2006 06:52:13 GMT
	(envelope-from alc@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k116qDaw026891
	for perforce@freebsd.org; Wed, 1 Feb 2006 06:52:13 GMT
	(envelope-from alc@freebsd.org)
Date: Wed, 1 Feb 2006 06:52:13 GMT
Message-Id: <200602010652.k116qDaw026891@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 90859 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: Wed, 01 Feb 2006 06:52:15 -0000

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

Change 90859 by alc@alc_home on 2006/02/01 06:51:49

	Simplify.

Affected files ...

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

Differences ...

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

@@ -513,7 +513,7 @@
 static vm_page_t
 preempt_contig_alloc(int *level, int free_pool)
 {
-	int l, lev = level ? *level : -1;
+	int l, lev = *level;
 	vm_object_t object;
 	vm_page_t m = NULL;
 	reservation_t sp, sp_next;
@@ -594,8 +594,7 @@
 	}
 done:		
 	KASSERT(lev > -1, ("preempt_contig_alloc: invalid level"));
-	if (level != NULL)
-		*level = lev;
+	*level = lev;
 	return (m);
 }