From owner-svn-src-projects@FreeBSD.ORG  Fri Oct 17 23:23:50 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 887D5106568E;
	Fri, 17 Oct 2008 23:23:50 +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 77E5E8FC0A;
	Fri, 17 Oct 2008 23:23:50 +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 m9HNNoZx000951;
	Fri, 17 Oct 2008 23:23:50 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9HNNodf000950;
	Fri, 17 Oct 2008 23:23:50 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200810172323.m9HNNodf000950@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Fri, 17 Oct 2008 23:23:50 +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: r184004 - projects/releng_6_xen/sys/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 23:23:50 -0000

Author: kmacy
Date: Fri Oct 17 23:23:50 2008
New Revision: 184004
URL: http://svn.freebsd.org/changeset/base/184004

Log:
  Don't set nkpt higher than the max required to map KVA

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

Modified: projects/releng_6_xen/sys/i386/xen/xen_machdep.c
==============================================================================
--- projects/releng_6_xen/sys/i386/xen/xen_machdep.c	Fri Oct 17 23:03:35 2008	(r184003)
+++ projects/releng_6_xen/sys/i386/xen/xen_machdep.c	Fri Oct 17 23:23:50 2008	(r184004)
@@ -836,8 +836,12 @@ initvalues(start_info_t *startinfo)
 	unsigned long i;
 	int ncpus;
 
-	nkpt = min(max((startinfo->nr_pages >> NPGPTD_SHIFT), nkpt),
-	    NPGPTD*NPDEPG - KPTDI);
+	nkpt = min(
+		min(
+			max((startinfo->nr_pages >> NPGPTD_SHIFT), nkpt),
+		    NPGPTD*NPDEPG - KPTDI),
+		    (HYPERVISOR_VIRT_START - KERNBASE) >> PDRSHIFT);
+	
 #ifdef SMP
 	ncpus = MAXCPU;
 #else
@@ -973,6 +977,8 @@ initvalues(start_info_t *startinfo)
 	     i++, cur_space += PAGE_SIZE) {
 		pdir = (offset + i) / NPDEPG;
 		curoffset = ((offset + i) % NPDEPG);
+		if (((offset + i) << PDRSHIFT) == VM_MAX_KERNEL_ADDRESS)
+			break;
 		
 		/*
 		 * make sure that all the initial page table pages