PERFORCE change 89486 for review

[Kip Macy]

http://perforce.freebsd.org/chv.cgi?CH=89486

Change 89486 by kmacy at kmacy:freebsd7_xen3 on 2006/01/11 03:48:26

	make sure that kernel does not try to allocate KVA in xen's space

Affected files ...

.. //depot/projects/xen3/src/sys/i386-xen/include/pmap.h#2 edit

Differences ...

==== //depot/projects/xen3/src/sys/i386-xen/include/pmap.h#2 (text+ko) ====

@@ -91,6 +91,8 @@
 #endif
 #endif
 
+#define XEN_PAGES       16
+
 /*
  * Pte related macros
  */
@@ -106,9 +108,9 @@
 #endif
 #ifndef NKPDE
 #ifdef SMP
-#define NKPDE	(KVA_PAGES - 1) /* number of page tables/pde's */
+#define NKPDE	(KVA_PAGES - 1 - XEN_PAGES) /* number of page tables/pde's */
 #else
-#define NKPDE	(KVA_PAGES)	/* number of page tables/pde's */
+#define NKPDE	(KVA_PAGES - XEN_PAGES)	/* number of page tables/pde's */
 #endif
 #endif
 
@@ -121,10 +123,10 @@
  * SMP_PRIVPAGES: The per-cpu address space is 0xff80000 -> 0xffbfffff
  */
 #ifdef SMP
-#define MPPTDI		(NPDEPTD-1)	/* per cpu ptd entry */
+#define MPPTDI		(NPDEPTD-1 - XEN_PAGES)	/* per cpu ptd entry */
 #define	KPTDI		(MPPTDI-NKPDE)	/* start of kernel virtual pde's */
 #else
-#define	KPTDI		(NPDEPTD-NKPDE)/* start of kernel virtual pde's */
+#define	KPTDI		(NPDEPTD-NKPDE-XEN_PAGES)/* start of kernel virtual pde's */
 #endif	/* SMP */
 #define	PTDPTDI		(KPTDI-NPGPTD)	/* ptd entry that points to ptd! */