From owner-p4-projects@FreeBSD.ORG  Wed Jan 11 03:48:43 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id EDC0E16A422; Wed, 11 Jan 2006 03:48:42 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id C751816A41F
	for <perforce@freebsd.org>; Wed, 11 Jan 2006 03:48:42 +0000 (GMT)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9323643D46
	for <perforce@freebsd.org>; Wed, 11 Jan 2006 03:48:42 +0000 (GMT)
	(envelope-from kmacy@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 k0B3mga5025101
	for <perforce@freebsd.org>; Wed, 11 Jan 2006 03:48:42 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0B3mgSt025098
	for perforce@freebsd.org; Wed, 11 Jan 2006 03:48:42 GMT
	(envelope-from kmacy@freebsd.org)
Date: Wed, 11 Jan 2006 03:48:42 GMT
Message-Id: <200601110348.k0B3mgSt025098@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 89486 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Jan 2006 03:48:43 -0000

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

Change 89486 by kmacy@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! */