d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the netback driver build for i386.

Browse Source 
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
This commit is contained in:
ken 2012-02-02 17:54:35 +00:00
parent 41ce073a83
commit 15e9b1348e
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/conf/files
View File

@ -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

2
sys/dev/xen/netback/netback.c
View File

@ -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>

11
sys/i386/include/xen/xenpmap.h
View File

@ -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_ */

6
sys/i386/include/xen/xenvar.h
View File

@ -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