svn commit: r183991 - in projects/releng_6_xen/sys/i386: i386 xen

[Kip Macy]

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);