From owner-svn-src-all@FreeBSD.ORG Thu Jun 5 12:27:14 2014 Return-Path: <owner-svn-src-all@FreeBSD.ORG> Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C3B5222D; Thu, 5 Jun 2014 12:27:14 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B08F0247E; Thu, 5 Jun 2014 12:27:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s55CRETC034466; Thu, 5 Jun 2014 12:27:14 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s55CREjf034465; Thu, 5 Jun 2014 12:27:14 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <201406051227.s55CREjf034465@svn.freebsd.org> From: Marius Strobl <marius@FreeBSD.org> Date: Thu, 5 Jun 2014 12:27:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r267101 - stable/9/sys/i386/include/xen X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" <svn-src-all.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>, <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/> List-Post: <mailto:svn-src-all@freebsd.org> List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>, <mailto:svn-src-all-request@freebsd.org?subject=subscribe> X-List-Received-Date: Thu, 05 Jun 2014 12:27:14 -0000 Author: marius Date: Thu Jun 5 12:27:14 2014 New Revision: 267101 URL: http://svnweb.freebsd.org/changeset/base/267101 Log: MFC: r255781 Fix compilation of the i386 PAE kernel config. For stable/9, this also fixes the compilation of xenhvm.ko in the latter case. Approved by: re (delphij) Modified: stable/9/sys/i386/include/xen/xenvar.h Directory Properties: stable/9/sys/ (props changed) Modified: stable/9/sys/i386/include/xen/xenvar.h ============================================================================== --- stable/9/sys/i386/include/xen/xenvar.h Thu Jun 5 11:48:36 2014 (r267100) +++ stable/9/sys/i386/include/xen/xenvar.h Thu Jun 5 12:27:14 2014 (r267101) @@ -106,9 +106,7 @@ void xen_destroy_contiguous_region(void #elif defined(XENHVM) -#if !defined(PAE) #define vtomach(va) pmap_kextract((vm_offset_t) (va)) -#endif #define PFNTOMFN(pa) (pa) #define MFNTOPFN(ma) (ma)