From owner-svn-src-projects@FreeBSD.ORG  Fri Oct 17 22:18:35 2008
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7C5A61065691;
	Fri, 17 Oct 2008 22:18:35 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6BBCD8FC14;
	Fri, 17 Oct 2008 22:18:35 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id m9HMIZFS099207;
	Fri, 17 Oct 2008 22:18:35 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9HMIZEN099205;
	Fri, 17 Oct 2008 22:18:35 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200810172218.m9HMIZEN099205@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Fri, 17 Oct 2008 22:18:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r183991 - in projects/releng_6_xen/sys/i386: i386 xen
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 17 Oct 2008 22:18:35 -0000

Author: kmacy
Date: Fri Oct 17 22:18:35 2008
New Revision: 183991
URL: http://svn.freebsd.org/changeset/base/183991

Log:
  Fix issues in bootstrap

Modified:
  projects/releng_6_xen/sys/i386/i386/support.s
  projects/releng_6_xen/sys/i386/xen/xen_machdep.c

Modified: projects/releng_6_xen/sys/i386/i386/support.s
==============================================================================
--- projects/releng_6_xen/sys/i386/i386/support.s	Fri Oct 17 21:29:05 2008	(r183990)
+++ projects/releng_6_xen/sys/i386/i386/support.s	Fri Oct 17 22:18:35 2008	(r183991)
@@ -1426,10 +1426,11 @@ ENTRY(bcmp)
  */
 /* void lgdt(struct region_descriptor *rdp); */
 ENTRY(lgdt)
+#ifndef XEN
 	/* reload the descriptor table */
 	movl	4(%esp),%eax
 	lgdt	(%eax)
-
+#endif
 	/* flush the prefetch q */
 	jmp	1f
 	nop

Modified: projects/releng_6_xen/sys/i386/xen/xen_machdep.c
==============================================================================
--- projects/releng_6_xen/sys/i386/xen/xen_machdep.c	Fri Oct 17 21:29:05 2008	(r183990)
+++ projects/releng_6_xen/sys/i386/xen/xen_machdep.c	Fri Oct 17 22:18:35 2008	(r183991)
@@ -962,7 +962,7 @@ initvalues(start_info_t *startinfo)
 	xen_pgdpt_pin(xpmap_ptom(VTOP(IdlePDPTnew)));
 
 	/* allocate remainder of nkpt pages */
-	for (offset = (KERNBASE >> PDRSHIFT), i = l1_pages - 1; i < nkpt;
+	for (offset = (KERNBASE >> PDRSHIFT), i = l1_pages; i < nkpt;
 	     i++, cur_space += PAGE_SIZE) {
 		pdir = (offset + i) / NPDEPG;
 		curoffset = ((offset + i) % NPDEPG);