From owner-p4-projects@FreeBSD.ORG  Thu Feb  2 05:02:53 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 E038616A423; Thu,  2 Feb 2006 05:02:52 +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 B62F316A420
	for <perforce@freebsd.org>; Thu,  2 Feb 2006 05:02:52 +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 4B4F843D45
	for <perforce@freebsd.org>; Thu,  2 Feb 2006 05:02:52 +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 k1252qig042083
	for <perforce@freebsd.org>; Thu, 2 Feb 2006 05:02:52 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1252pdN042080
	for perforce@freebsd.org; Thu, 2 Feb 2006 05:02:51 GMT
	(envelope-from kmacy@freebsd.org)
Date: Thu, 2 Feb 2006 05:02:51 GMT
Message-Id: <200602020502.k1252pdN042080@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 90912 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: Thu, 02 Feb 2006 05:02:53 -0000

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

Change 90912 by kmacy@kmacy:freebsd7_xen3 on 2006/02/02 05:01:51

	add back in ISA hole

Affected files ...

.. //depot/projects/xen3/src/sys/conf/Makefile.i386-xen#2 edit
.. //depot/projects/xen3/src/sys/conf/ldscript.i386-xen#2 delete
.. //depot/projects/xen3/src/sys/i386-xen/i386-xen/genassym.c#2 delete
.. //depot/projects/xen3/src/sys/i386-xen/i386-xen/pmap.c#3 edit
.. //depot/projects/xen3/src/sys/i386-xen/include/xenvar.h#7 edit

Differences ...

==== //depot/projects/xen3/src/sys/conf/Makefile.i386-xen#2 (text+ko) ====

@@ -30,7 +30,6 @@
 .endif
 .include "$S/conf/kern.pre.mk"
 
-M= i386-xen
 MKMODULESENV+= MACHINE=i386-xen
 
 %BEFORE_DEPEND

==== //depot/projects/xen3/src/sys/i386-xen/i386-xen/pmap.c#3 (text+ko) ====

@@ -1211,7 +1211,7 @@
 	/* XXX copies current process, does not fill in MPPTDI */
 #ifdef XEN
 	bcopy(kernel_pmap->pm_pdir + KPTDI, pmap->pm_pdir + KPTDI, 
-	      nkpt * sizeof(pd_entry_t));
+	       NKPDE * sizeof(pd_entry_t));
 	/* XXX need to copy global address entries to page directory's L1 shadow */
 	ma = xpmap_ptom(VM_PAGE_TO_PHYS(ptdpg[NPGPTD]));
 	/* L1 pin shadow page director{y,ies} */

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

@@ -19,6 +19,9 @@
  * FreeBSD doesn't
  */
 
+
+#define ADD_ISA_HOLE
+
 #ifdef ADD_ISA_HOLE
 #define ISA_INDEX_OFFSET 1024 
 #define ISA_PDR_OFFSET 1