svn commit: r187425 - in stable/7/sys: . amd64/include contrib/pf dev/ath/ath_hal dev/cxgb

Alan Cox alc at FreeBSD.org
Sun Jan 18 22:55:30 PST 2009


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)


More information about the svn-src-stable-7 mailing list