From owner-svn-src-projects@FreeBSD.ORG  Sun May 15 02:09:13 2011
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 2A638106564A;
	Sun, 15 May 2011 02:09:13 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1AEC98FC17;
	Sun, 15 May 2011 02:09:13 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p4F29CT3022817;
	Sun, 15 May 2011 02:09:13 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4F29CiW022815;
	Sun, 15 May 2011 02:09:12 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201105150209.p4F29CiW022815@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Sun, 15 May 2011 02:09:12 +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: r221940 - projects/bhyve/sys/amd64/vmm
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: Sun, 15 May 2011 02:09:13 -0000

Author: jhb
Date: Sun May 15 02:09:12 2011
New Revision: 221940
URL: http://svn.freebsd.org/changeset/base/221940

Log:
  Enable handling of 1GB pages in the direct map since HEAD supports those.
  
  Submitted by:	neel

Modified:
  projects/bhyve/sys/amd64/vmm/vmm_mem.c

Modified: projects/bhyve/sys/amd64/vmm/vmm_mem.c
==============================================================================
--- projects/bhyve/sys/amd64/vmm/vmm_mem.c	Sun May 15 01:08:51 2011	(r221939)
+++ projects/bhyve/sys/amd64/vmm/vmm_mem.c	Sun May 15 02:09:12 2011	(r221940)
@@ -168,8 +168,7 @@ vmm_mem_direct_map(vm_paddr_t start, vm_
 	if (end >= NBPML4)
 		panic("Cannot map memory beyond %ldGB", NBPML4 / GB);
 
-	/* XXX FreeBSD 8.1 does not use 1G superpages in the direct map */
-	if (0 && vmm_supports_1G_pages())
+	if (vmm_supports_1G_pages())
 		superpage_size = NBPDP;
 	else
 		superpage_size = NBPDR;