From owner-svn-src-all@FreeBSD.ORG Mon Jan 19 06:55:29 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C4D65106564A; Mon, 19 Jan 2009 06:55:29 +0000 (UTC) (envelope-from alc@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B2B0F8FC17; Mon, 19 Jan 2009 06:55:29 +0000 (UTC) (envelope-from alc@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0J6tTja000990; Mon, 19 Jan 2009 06:55:29 GMT (envelope-from alc@svn.freebsd.org) Received: (from alc@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0J6tTEr000988; Mon, 19 Jan 2009 06:55:29 GMT (envelope-from alc@svn.freebsd.org) Message-Id: <200901190655.n0J6tTEr000988@svn.freebsd.org> From: Alan Cox Date: Mon, 19 Jan 2009 06:55:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r187425 - in stable/7/sys: . amd64/include contrib/pf dev/ath/ath_hal dev/cxgb X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Jan 2009 06:55:30 -0000 Author: alc Date: Mon Jan 19 06:55:29 2009 New Revision: 187425 URL: http://svn.freebsd.org/changeset/base/187425 Log: MFC rev 180101 Strictly speaking, the definition of VM_MAX_KERNEL_ADDRESS is wrong. However, in practice, the error (currently) makes no difference because the computation performed by KVADDR() hides the error. This revision fixes the error. Also, eliminate a (now) unused definition. Modified: stable/7/sys/ (props changed) stable/7/sys/amd64/include/pmap.h stable/7/sys/amd64/include/vmparam.h stable/7/sys/contrib/pf/ (props changed) stable/7/sys/dev/ath/ath_hal/ (props changed) stable/7/sys/dev/cxgb/ (props changed) Modified: stable/7/sys/amd64/include/pmap.h ============================================================================== --- stable/7/sys/amd64/include/pmap.h Mon Jan 19 06:42:44 2009 (r187424) +++ stable/7/sys/amd64/include/pmap.h Mon Jan 19 06:55:29 2009 (r187425) @@ -110,7 +110,6 @@ #define NKPML4E 1 /* number of kernel PML4 slots */ #define NKPDPE 1 /* number of kernel PDP slots */ -#define NKPDE (NKPDPE*NPDEPG) /* number of kernel PD slots */ #define NUPML4E (NPML4EPG/2) /* number of userland PML4 pages */ #define NUPDPE (NUPML4E*NPDPEPG)/* number of userland PDP pages */ Modified: stable/7/sys/amd64/include/vmparam.h ============================================================================== --- stable/7/sys/amd64/include/vmparam.h Mon Jan 19 06:42:44 2009 (r187424) +++ stable/7/sys/amd64/include/vmparam.h Mon Jan 19 06:55:29 2009 (r187425) @@ -147,7 +147,7 @@ * 0xffffffff80000000 KERNBASE */ -#define VM_MAX_KERNEL_ADDRESS KVADDR(KPML4I, NPDPEPG-1, NKPDE-1, NPTEPG-1) +#define VM_MAX_KERNEL_ADDRESS KVADDR(KPML4I, NPDPEPG-1, NPDEPG-1, NPTEPG-1) #define VM_MIN_KERNEL_ADDRESS KVADDR(KPML4I, KPDPI, 0, 0) #define DMAP_MIN_ADDRESS KVADDR(DMPML4I, 0, 0, 0)