From owner-p4-projects@FreeBSD.ORG Wed Oct 26 06:37:17 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F02D516A421; Wed, 26 Oct 2005 06:37:16 +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 A613616A420 for ; Wed, 26 Oct 2005 06:37:16 +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 F08DE43D53 for ; Wed, 26 Oct 2005 06:37:15 +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 j9Q6bFeU087033 for ; Wed, 26 Oct 2005 06:37:15 GMT (envelope-from alc@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9Q6bF6R087024 for perforce@freebsd.org; Wed, 26 Oct 2005 06:37:15 GMT (envelope-from alc@freebsd.org) Date: Wed, 26 Oct 2005 06:37:15 GMT Message-Id: <200510260637.j9Q6bF6R087024@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to alc@freebsd.org using -f From: Alan Cox To: Perforce Change Reviews Cc: Subject: PERFORCE change 85875 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Oct 2005 06:37:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=85875 Change 85875 by alc@alc_home on 2005/10/26 06:36:46 Fix white space. Affected files ... .. //depot/projects/superpages/src/sys/vm/vm_reserve.c#10 edit Differences ... ==== //depot/projects/superpages/src/sys/vm/vm_reserve.c#10 (text+ko) ==== @@ -535,10 +535,11 @@ for (l = lev; l <= SP_LEVELS - 2; l++) { mtx_lock(&rres_mtx); TAILQ_FOREACH_SAFE(sp, &rres[l], next, sp_next) { - KASSERT(sp->rql==l && sp->rqllevel,("preempt_contig_alloc: rql invalid")); - object = sp->object; - was_trylocked = VM_OBJECT_TRYLOCK(object); - if (was_trylocked || VM_OBJECT_LOCKED(object)) { + KASSERT(sp->rql == l && sp->rql < sp->level, + ("preempt_contig_alloc: rql invalid")); + object = sp->object; + was_trylocked = VM_OBJECT_TRYLOCK(object); + if (was_trylocked || VM_OBJECT_LOCKED(object)) { TAILQ_REMOVE(&rres[l], sp, next); mtx_unlock(&rres_mtx); sp->rql = NO_RESQ; @@ -556,7 +557,7 @@ } /* Downgrade level, retry free, rres... */ - while (lev>=0) { + while (lev >= 0) { lev--; if (free_pool) { @@ -569,10 +570,11 @@ /* 5, 7, 9... */ mtx_lock(&rres_mtx); TAILQ_FOREACH_SAFE(sp, &rres[lev], next, sp_next) { - KASSERT(sp->rql==lev && sp->rqllevel,("preempt_alloc_contig")); - object = sp->object; - was_trylocked = VM_OBJECT_TRYLOCK(object); - if (was_trylocked || VM_OBJECT_LOCKED(object)) { + KASSERT(sp->rql == lev && sp->rql < sp->level, + ("preempt_contig_alloc")); + object = sp->object; + was_trylocked = VM_OBJECT_TRYLOCK(object); + if (was_trylocked || VM_OBJECT_LOCKED(object)) { TAILQ_REMOVE(&rres[lev], sp, next); mtx_unlock(&rres_mtx); sp->rql = NO_RESQ;