From owner-svn-src-head@FreeBSD.ORG Thu Feb 2 17:54:35 2012 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D7E2B106566B; Thu, 2 Feb 2012 17:54:35 +0000 (UTC) (envelope-from ken@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C1A2C8FC08; Thu, 2 Feb 2012 17:54:35 +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 q12HsZHH047643; Thu, 2 Feb 2012 17:54:35 GMT (envelope-from ken@svn.freebsd.org) Received: (from ken@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q12HsZh5047637; Thu, 2 Feb 2012 17:54:35 GMT (envelope-from ken@svn.freebsd.org) Message-Id: <201202021754.q12HsZh5047637@svn.freebsd.org> From: "Kenneth D. Merry" Date: Thu, 2 Feb 2012 17:54:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r230916 - in head/sys: conf dev/xen/netback i386/include/xen X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Feb 2012 17:54:35 -0000 Author: ken Date: Thu Feb 2 17:54:35 2012 New Revision: 230916 URL: http://svn.freebsd.org/changeset/base/230916 Log: Fix the netback driver build for i386. netback.c: Add missing VM includes. xen/xenvar.h, xen/xenpmap.h: Move some XENHVM macros from to on i386 to match the amd64 headers. conf/files: Add netback to the build. Submitted by: jhb MFC after: 3 days Modified: head/sys/conf/files head/sys/dev/xen/netback/netback.c head/sys/i386/include/xen/xenpmap.h head/sys/i386/include/xen/xenvar.h Modified: head/sys/conf/files ============================================================================== --- head/sys/conf/files Thu Feb 2 17:25:39 2012 (r230915) +++ head/sys/conf/files Thu Feb 2 17:54:35 2012 (r230916) @@ -3531,6 +3531,7 @@ dev/xen/blkback/blkback.c optional xen | dev/xen/console/console.c optional xen dev/xen/console/xencons_ring.c optional xen dev/xen/control/control.c optional xen | xenhvm +dev/xen/netback/netback.c optional xen | xenhvm dev/xen/netfront/netfront.c optional xen | xenhvm dev/xen/xenpci/xenpci.c optional xenpci dev/xen/xenpci/evtchn.c optional xenpci Modified: head/sys/dev/xen/netback/netback.c ============================================================================== --- head/sys/dev/xen/netback/netback.c Thu Feb 2 17:25:39 2012 (r230915) +++ head/sys/dev/xen/netback/netback.c Thu Feb 2 17:54:35 2012 (r230916) @@ -75,6 +75,8 @@ __FBSDID("$FreeBSD$"); #include #include +#include +#include #include #include Modified: head/sys/i386/include/xen/xenpmap.h ============================================================================== --- head/sys/i386/include/xen/xenpmap.h Thu Feb 2 17:25:39 2012 (r230915) +++ head/sys/i386/include/xen/xenpmap.h Thu Feb 2 17:54:35 2012 (r230916) @@ -232,15 +232,6 @@ phys_to_machine_mapping_valid(unsigned l return xen_phys_machine[pfn] != INVALID_P2M_ENTRY; } -#elif defined(XENHVM) - -#define set_phys_to_machine(pfn, mfn) ((void)0) -#define phys_to_machine_mapping_valid(pfn) (TRUE) - -#if !defined(PAE) -#define vtomach(va) pmap_kextract((vm_offset_t) (va)) -#endif - -#endif /* !XEN && !XENHVM */ +#endif /* !XEN */ #endif /* _XEN_XENPMAP_H_ */ Modified: head/sys/i386/include/xen/xenvar.h ============================================================================== --- head/sys/i386/include/xen/xenvar.h Thu Feb 2 17:25:39 2012 (r230915) +++ head/sys/i386/include/xen/xenvar.h Thu Feb 2 17:54:35 2012 (r230916) @@ -106,9 +106,15 @@ 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) +#define set_phys_to_machine(pfn, mfn) ((void)0) +#define phys_to_machine_mapping_valid(pfn) (TRUE) + #endif /* !XEN && !XENHVM */ #endif