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 <machine/xen/xenpmap.h> to
<machine/xen/xenvar.h> 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 <vm/vm.h>
#include <vm/pmap.h>
+#include <vm/vm_extern.h>
+#include <vm/vm_kern.h>
#include <machine/_inttypes.h>
#include <machine/xen/xen-os.h>
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
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
