From owner-cvs-all@FreeBSD.ORG Mon Aug 15 09:02:02 2005 Return-Path: X-Original-To: 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 8B0D616A41F; Mon, 15 Aug 2005 09:02:02 +0000 (GMT) (envelope-from rwatson@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2650343D45; Mon, 15 Aug 2005 09:02:02 +0000 (GMT) (envelope-from rwatson@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 j7F922ti037423; Mon, 15 Aug 2005 09:02:02 GMT (envelope-from rwatson@repoman.freebsd.org) Received: (from rwatson@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j7F922R3037422; Mon, 15 Aug 2005 09:02:02 GMT (envelope-from rwatson) Message-Id: <200508150902.j7F922R3037422@repoman.freebsd.org> From: Robert Watson Date: Mon, 15 Aug 2005 09:02:01 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: RELENG_6 Cc: Subject: cvs commit: src/sys/vm vm_page.h X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Aug 2005 09:02:02 -0000 rwatson 2005-08-15 09:02:01 UTC FreeBSD src repository Modified files: (Branch: RELENG_6) sys/vm vm_page.h Log: Merge vm_page.h:1.137 from HEAD to RELENG_6: Don't perform a nested include of opt_vmpage.h if LIBMEMSTAT is defined, as opt_vmpage.h will not be available to user space library builds. A similar existing check is present for KLD_MODULE for similar reasons. Approved by: re (hrs) Revision Changes Path 1.136.2.1 +1 -1 src/sys/vm/vm_page.h