Module Name: src
Committed By: jym
Date: Thu Jul 15 18:58:41 UTC 2010
Modified Files:
src/sys/arch/i386/include: pmap.h
Log Message:
Purely cosmetic: move L2_SLOT_KERNBASE out of the PAE #ifdef/#endif block.
To generate a diff of this commit:
cvs rdiff -u -r1.105 -r1.106 src/sys/arch/i386/include/pmap.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/include/pmap.h
diff -u src/sys/arch/i386/include/pmap.h:1.105 src/sys/arch/i386/include/pmap.h:1.106
--- src/sys/arch/i386/include/pmap.h:1.105 Mon Mar 1 00:55:33 2010
+++ src/sys/arch/i386/include/pmap.h Thu Jul 15 18:58:40 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.105 2010/03/01 00:55:33 jym Exp $ */
+/* $NetBSD: pmap.h,v 1.106 2010/07/15 18:58:40 jym Exp $ */
/*
*
@@ -219,12 +219,10 @@
#ifdef PAE
#define L2_SLOT_PTE (KERNBASE/NBPD_L2-4) /* 1532: for recursive PDP map */
#define L2_SLOT_KERN (KERNBASE/NBPD_L2) /* 1536: start of kernel space */
-#define L2_SLOT_KERNBASE L2_SLOT_KERN
#define L2_SLOT_APTE 1960 /* 1964-2047 reserved by Xen */
#else /* PAE */
#define L2_SLOT_PTE (KERNBASE/NBPD_L2-1) /* 767: for recursive PDP map */
#define L2_SLOT_KERN (KERNBASE/NBPD_L2) /* 768: start of kernel space */
-#define L2_SLOT_KERNBASE L2_SLOT_KERN
#ifndef XEN
#define L2_SLOT_APTE 1023 /* 1023: alternative recursive slot */
#else
@@ -232,6 +230,7 @@
#endif
#endif /* PAE */
+#define L2_SLOT_KERNBASE L2_SLOT_KERN
#define PDIR_SLOT_KERN L2_SLOT_KERN
#define PDIR_SLOT_PTE L2_SLOT_PTE
