From owner-cvs-all@FreeBSD.ORG  Mon Apr 21 22:36:15 2003
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 5937A37B401; Mon, 21 Apr 2003 22:36:15 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id EB6D943FB1; Mon, 21 Apr 2003 22:36:14 -0700 (PDT)
	(envelope-from alc@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h3M5aE0U092339;
	Mon, 21 Apr 2003 22:36:14 -0700 (PDT)
	(envelope-from alc@repoman.freebsd.org)
Received: (from alc@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3M5aEF6092335;
	Mon, 21 Apr 2003 22:36:14 -0700 (PDT)
Message-Id: <200304220536.h3M5aEF6092335@repoman.freebsd.org>
From: Alan Cox <alc@FreeBSD.org>
Date: Mon, 21 Apr 2003 22:36:14 -0700 (PDT)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/sys/vm vm_page.c
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Apr 2003 05:36:15 -0000

alc         2003/04/21 22:36:14 PDT

  FreeBSD src repository

  Modified files:
    sys/vm               vm_page.c 
  Log:
  Revision 1.52 of vm/uma_core.c has led to UMA's obj_alloc() being
  called without Giant; and obj_alloc() in turn calls vm_page_alloc()
  without Giant.  This causes an assertion failure in vm_page_alloc().
  Fortunately, obj_alloc() is now MPSAFE.  So, we need only clean up
  some assertions.
  
   - Weaken the assertion in vm_page_lookup() to require Giant only
     if the vm_object isn't locked.
   - Remove an assertion from vm_page_alloc() that duplicates a check
     performed in vm_page_lookup().
  
  In collaboration with:  gallatin, jake, jeff
  
  Revision  Changes    Path
  1.246     +2 -3      src/sys/vm/vm_page.c