From owner-svn-src-projects@FreeBSD.ORG Thu Jun 27 21:34:30 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 85EE85D8; Thu, 27 Jun 2013 21:34:30 +0000 (UTC) (envelope-from neel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 763461041; Thu, 27 Jun 2013 21:34:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5RLYUk4087761; Thu, 27 Jun 2013 21:34:30 GMT (envelope-from neel@svn.freebsd.org) Received: (from neel@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5RLYU01087760; Thu, 27 Jun 2013 21:34:30 GMT (envelope-from neel@svn.freebsd.org) Message-Id: <201306272134.r5RLYU01087760@svn.freebsd.org> From: Neel Natu Date: Thu, 27 Jun 2013 21:34:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r252319 - projects/bhyve_npt_pmap/sys/amd64/include X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Jun 2013 21:34:30 -0000 Author: neel Date: Thu Jun 27 21:34:29 2013 New Revision: 252319 URL: http://svnweb.freebsd.org/changeset/base/252319 Log: PG_AVAIL1 is available for software use only in the regular x86 page tables. PG_AVAIL2 and PG_AVAIL3 on the other hand are available for software use in both regular and nested page tables. Redefine PG_W as PG_AVAIL3 instead of PG_AVAIL1 so we can use the same macro regardless of the underlying pmap_type. Modified: projects/bhyve_npt_pmap/sys/amd64/include/pmap.h Modified: projects/bhyve_npt_pmap/sys/amd64/include/pmap.h ============================================================================== --- projects/bhyve_npt_pmap/sys/amd64/include/pmap.h Thu Jun 27 21:02:26 2013 (r252318) +++ projects/bhyve_npt_pmap/sys/amd64/include/pmap.h Thu Jun 27 21:34:29 2013 (r252319) @@ -66,9 +66,13 @@ #define PG_PDE_PAT 0x1000 /* PAT PAT index */ #define PG_NX (1ul<<63) /* No-execute */ +/* + * PG_AVAIL1 is available for software use only with the regular x86 PTEs. + * PG_AVAIL2 and PG_AVAIL3 are available in both the regular and nested PTEs. + */ /* Our various interpretations of the above */ -#define PG_W PG_AVAIL1 /* "Wired" pseudoflag */ +#define PG_W PG_AVAIL3 /* "Wired" pseudoflag */ #define PG_MANAGED PG_AVAIL2 #define PG_FRAME (0x000ffffffffff000ul) #define PG_PS_FRAME (0x000fffffffe00000ul)