From 048a50f3541c49334db25d52bbb7d216e1e7cb45 Mon Sep 17 00:00:00 2001
From: "Kenneth D. Merry" <ken@FreeBSD.org>
Date: Thu, 2 Feb 2012 17:54:35 +0000
Subject: [PATCH] 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
---
 sys/conf/files                 |  1 +
 sys/dev/xen/netback/netback.c  |  2 ++
 sys/i386/include/xen/xenpmap.h | 11 +----------
 sys/i386/include/xen/xenvar.h  |  6 ++++++
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/sys/conf/files b/sys/conf/files
index 8f9f222dd90..7df4f6720a6 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -3531,6 +3531,7 @@ dev/xen/blkback/blkback.c	optional xen | xenhvm
 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
diff --git a/sys/dev/xen/netback/netback.c b/sys/dev/xen/netback/netback.c
index ef7b074d536..b00daf08551 100644
--- a/sys/dev/xen/netback/netback.c
+++ b/sys/dev/xen/netback/netback.c
@@ -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>
diff --git a/sys/i386/include/xen/xenpmap.h b/sys/i386/include/xen/xenpmap.h
index 169e4088445..8287e723a7e 100644
--- a/sys/i386/include/xen/xenpmap.h
+++ b/sys/i386/include/xen/xenpmap.h
@@ -232,15 +232,6 @@ phys_to_machine_mapping_valid(unsigned long pfn)
 	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_ */
diff --git a/sys/i386/include/xen/xenvar.h b/sys/i386/include/xen/xenvar.h
index 365930a7960..137984d2a59 100644
--- a/sys/i386/include/xen/xenvar.h
+++ b/sys/i386/include/xen/xenvar.h
@@ -106,9 +106,15 @@ void  xen_destroy_contiguous_region(void * addr, int npages);
 
 #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